github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the build.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-07-10 11:12:21 +09:00
parent 2255724637
commit a338a7a53e
4 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/components/guardian_spec.rb
View File

@ -2174,6 +2174,7 @@ describe Guardian do
context 'when SSO email override is active' do context 'when SSO email override is active' do
before do before do
SiteSetting.email_editable = false
SiteSetting.enable_sso = true SiteSetting.enable_sso = true
SiteSetting.sso_overrides_email = true SiteSetting.sso_overrides_email = true
end end

1
spec/controllers/admin/users_controller_spec.rb
View File

@ -547,6 +547,7 @@ describe Admin::UsersController do
before do before do
log_in(:admin) log_in(:admin)
SiteSetting.email_editable = false
SiteSetting.enable_sso = true SiteSetting.enable_sso = true
SiteSetting.sso_overrides_email = true SiteSetting.sso_overrides_email = true
SiteSetting.sso_overrides_name = true SiteSetting.sso_overrides_name = true

1
spec/controllers/session_controller_spec.rb
View File

@ -343,6 +343,7 @@ describe SessionController do
describe 'local attribute override from SSO payload' do describe 'local attribute override from SSO payload' do
before do before do
SiteSetting.email_editable = false
SiteSetting.sso_overrides_email = true SiteSetting.sso_overrides_email = true
SiteSetting.sso_overrides_username = true SiteSetting.sso_overrides_username = true
SiteSetting.sso_overrides_name = true SiteSetting.sso_overrides_name = true

2
spec/models/discourse_single_sign_on_spec.rb
View File

@ -159,6 +159,7 @@ describe DiscourseSingleSignOn do
it "can override name / email / username" do it "can override name / email / username" do
admin = Fabricate(:admin) admin = Fabricate(:admin)
SiteSetting.email_editable = false
SiteSetting.sso_overrides_name = true SiteSetting.sso_overrides_name = true
SiteSetting.sso_overrides_email = true SiteSetting.sso_overrides_email = true
SiteSetting.sso_overrides_username = true SiteSetting.sso_overrides_username = true
@ -257,6 +258,7 @@ describe DiscourseSingleSignOn do
it 'deactivates accounts that have updated email address' do it 'deactivates accounts that have updated email address' do
SiteSetting.email_editable = false
SiteSetting.sso_overrides_email = true SiteSetting.sso_overrides_email = true
sso.require_activation = true sso.require_activation = true