Fix the build.

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

View File

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

View File

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

View File

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

View File

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