diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 18:09:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 18:09:37 +0300 |
commit | 8a840df2e433bc39d033b20e64402fa3f56445d3 (patch) | |
tree | 92a941d06b5ddd3ad3f7ad846bf83f0c33d57dbb /spec/views/devise | |
parent | 5c8c561ac63d7b8f372316b4409500474220fcda (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views/devise')
-rw-r--r-- | spec/views/devise/sessions/new.html.haml_spec.rb | 4 | ||||
-rw-r--r-- | spec/views/devise/shared/_signin_box.html.haml_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/views/devise/sessions/new.html.haml_spec.rb b/spec/views/devise/sessions/new.html.haml_spec.rb index 66afc2af7ce..27bd683bbf0 100644 --- a/spec/views/devise/sessions/new.html.haml_spec.rb +++ b/spec/views/devise/sessions/new.html.haml_spec.rb @@ -54,14 +54,14 @@ describe 'devise/sessions/new' do def enable_ldap stub_ldap_setting(enabled: true) - assign(:ldap_servers, [server]) + allow(view).to receive(:ldap_servers).and_return([server]) allow(view).to receive(:form_based_providers).and_return([:ldapmain]) allow(view).to receive(:omniauth_callback_path).with(:user, 'ldapmain').and_return('/ldapmain') end def disable_ldap_sign_in allow(view).to receive(:ldap_sign_in_enabled?).and_return(false) - assign(:ldap_servers, []) + allow(view).to receive(:ldap_servers).and_return([]) end def disable_captcha diff --git a/spec/views/devise/shared/_signin_box.html.haml_spec.rb b/spec/views/devise/shared/_signin_box.html.haml_spec.rb index f8867477603..dfd8c315e50 100644 --- a/spec/views/devise/shared/_signin_box.html.haml_spec.rb +++ b/spec/views/devise/shared/_signin_box.html.haml_spec.rb @@ -6,7 +6,7 @@ describe 'devise/shared/_signin_box' do describe 'Crowd form' do before do stub_devise - assign(:ldap_servers, []) + allow(view).to receive(:ldap_servers).and_return([]) allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings) allow(view).to receive(:captcha_enabled?).and_return(false) allow(view).to receive(:captcha_on_login_required?).and_return(false) |