Add latest changes from gitlab-org/gitlab@master

1 files changed, 48 insertions, 46 deletions

diff --git a/spec/views/devise/sessions/new.html.haml_spec.rb b/spec/views/devise/sessions/new.html.haml_spec.rb
index bad01ec2c3d..8de2eab36e9 100644
--- a/spec/views/devise/sessions/new.html.haml_spec.rb
+++ b/spec/views/devise/sessions/new.html.haml_spec.rb
@@ -31,71 +31,73 @@ RSpec.describe 'devise/sessions/new' do
 
   flag_values = [true, false]
   flag_values.each do |val|
-    before do
-      stub_feature_flags(restyle_login_page: val)
-    end
+    context "with #{val}" do
+      before do
+        stub_feature_flags(restyle_login_page: val)
+      end
 
-    describe 'ldap' do
-      include LdapHelpers
+      describe 'ldap' do
+        include LdapHelpers
 
-      let(:server) { { provider_name: 'ldapmain', label: 'LDAP' }.with_indifferent_access }
+        let(:server) { { provider_name: 'ldapmain', label: 'LDAP' }.with_indifferent_access }
 
-      before do
-        enable_ldap
-        stub_devise
-        disable_captcha
-        disable_sign_up
-        disable_other_signin_methods
+        before do
+          enable_ldap
+          stub_devise
+          disable_captcha
+          disable_sign_up
+          disable_other_signin_methods
 
-        allow(view).to receive(:experiment_enabled?).and_return(false)
-      end
+          allow(view).to receive(:experiment_enabled?).and_return(false)
+        end
 
-      it 'is shown when enabled' do
-        render
+        it 'is shown when enabled' do
+          render
 
-        expect(rendered).to have_selector('.new-session-tabs')
-        expect(rendered).to have_selector('[data-testid="ldap-tab"]')
-        expect(rendered).to have_field('LDAP Username')
-      end
+          expect(rendered).to have_selector('.new-session-tabs')
+          expect(rendered).to have_selector('[data-testid="ldap-tab"]')
+          expect(rendered).to have_field('LDAP Username')
+        end
 
-      it 'is not shown when LDAP sign in is disabled' do
-        disable_ldap_sign_in
+        it 'is not shown when LDAP sign in is disabled' do
+          disable_ldap_sign_in
 
-        render
+          render
 
-        expect(rendered).to have_content('No authentication methods configured')
-        expect(rendered).not_to have_selector('[data-testid="ldap-tab"]')
-        expect(rendered).not_to have_field('LDAP Username')
+          expect(rendered).to have_content('No authentication methods configured')
+          expect(rendered).not_to have_selector('[data-testid="ldap-tab"]')
+          expect(rendered).not_to have_field('LDAP Username')
+        end
       end
-    end
-
-    describe 'Google Tag Manager' do
-      let!(:gtm_id) { 'GTM-WWKMTWS' }
 
-      subject { rendered }
+      describe 'Google Tag Manager' do
+        let!(:gtm_id) { 'GTM-WWKMTWS' }
 
-      before do
-        stub_devise
-        disable_captcha
-        stub_config(extra: { google_tag_manager_id: gtm_id, google_tag_manager_nonce_id: gtm_id })
-      end
+        subject { rendered }
 
-      describe 'when Google Tag Manager is enabled' do
         before do
-          enable_gtm
-          render
+          stub_devise
+          disable_captcha
+          stub_config(extra: { google_tag_manager_id: gtm_id, google_tag_manager_nonce_id: gtm_id })
         end
 
-        it { is_expected.to match /www.googletagmanager.com/ }
-      end
+        describe 'when Google Tag Manager is enabled' do
+          before do
+            enable_gtm
+            render
+          end
 
-      describe 'when Google Tag Manager is disabled' do
-        before do
-          disable_gtm
-          render
+          it { is_expected.to match /www.googletagmanager.com/ }
         end
 
-        it { is_expected.not_to match /www.googletagmanager.com/ }
+        describe 'when Google Tag Manager is disabled' do
+          before do
+            disable_gtm
+            render
+          end
+
+          it { is_expected.not_to match /www.googletagmanager.com/ }
+        end
       end
     end
   end