Add latest changes from gitlab-org/gitlab@master

1 files changed, 134 insertions, 132 deletions

diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb
index fee75496a1e..db0ae79c9c4 100644
--- a/spec/features/admin/admin_appearance_spec.rb
+++ b/spec/features/admin/admin_appearance_spec.rb
@@ -8,184 +8,186 @@ RSpec.describe 'Admin Appearance', feature_category: :shared do
 
   flag_values = [true, false]
   flag_values.each do |val|
-    before do
-      stub_feature_flags(restyle_login_page: val)
-    end
-
-    it 'create new appearance' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit admin_application_settings_appearances_path
-
-      fill_in 'appearance_title', with: 'MyCompany'
-      fill_in 'appearance_description', with: 'dev server'
-      fill_in 'appearance_pwa_name', with: 'GitLab PWA'
-      fill_in 'appearance_pwa_short_name', with: 'GitLab'
-      fill_in 'appearance_pwa_description', with: 'GitLab as PWA'
-      fill_in 'appearance_new_project_guidelines', with: 'Custom project guidelines'
-      fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines'
-      click_button 'Update appearance settings'
-
-      expect(page).to have_current_path admin_application_settings_appearances_path, ignore_query: true
-      expect(page).to have_content 'Appearance'
-
-      expect(page).to have_field('appearance_title', with: 'MyCompany')
-      expect(page).to have_field('appearance_description', with: 'dev server')
-      expect(page).to have_field('appearance_pwa_name', with: 'GitLab PWA')
-      expect(page).to have_field('appearance_pwa_short_name', with: 'GitLab')
-      expect(page).to have_field('appearance_pwa_description', with: 'GitLab as PWA')
-      expect(page).to have_field('appearance_new_project_guidelines', with: 'Custom project guidelines')
-      expect(page).to have_field('appearance_profile_image_guidelines', with: 'Custom profile image guidelines')
-      expect(page).to have_content 'Last edit'
-    end
+    context "with #{val}" do
+      before do
+        stub_feature_flags(restyle_login_page: val)
+      end
 
-    it 'preview sign-in page appearance' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
+      it 'create new appearance' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
 
-      visit admin_application_settings_appearances_path
-      click_link "Sign-in page"
+        fill_in 'appearance_title', with: 'MyCompany'
+        fill_in 'appearance_description', with: 'dev server'
+        fill_in 'appearance_pwa_name', with: 'GitLab PWA'
+        fill_in 'appearance_pwa_short_name', with: 'GitLab'
+        fill_in 'appearance_pwa_description', with: 'GitLab as PWA'
+        fill_in 'appearance_new_project_guidelines', with: 'Custom project guidelines'
+        fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines'
+        click_button 'Update appearance settings'
 
-      expect(find('#login')).to be_disabled
-      expect(find('#password')).to be_disabled
-      expect(find('button')).to be_disabled
+        expect(page).to have_current_path admin_application_settings_appearances_path, ignore_query: true
+        expect(page).to have_content 'Appearance'
+
+        expect(page).to have_field('appearance_title', with: 'MyCompany')
+        expect(page).to have_field('appearance_description', with: 'dev server')
+        expect(page).to have_field('appearance_pwa_name', with: 'GitLab PWA')
+        expect(page).to have_field('appearance_pwa_short_name', with: 'GitLab')
+        expect(page).to have_field('appearance_pwa_description', with: 'GitLab as PWA')
+        expect(page).to have_field('appearance_new_project_guidelines', with: 'Custom project guidelines')
+        expect(page).to have_field('appearance_profile_image_guidelines', with: 'Custom profile image guidelines')
+        expect(page).to have_content 'Last edit'
+      end
 
-      expect_custom_sign_in_appearance(appearance)
-    end
+      it 'preview sign-in page appearance' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
 
-    it 'preview new project page appearance', :js do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
+        click_link "Sign-in page"
 
-      visit admin_application_settings_appearances_path
-      click_link "New project page"
+        expect(find('#login')).to be_disabled
+        expect(find('#password')).to be_disabled
+        expect(find('button')).to be_disabled
 
-      expect_custom_new_project_appearance(appearance)
-    end
+        expect_custom_sign_in_appearance(appearance)
+      end
 
-    context 'Custom system header and footer' do
-      before do
+      it 'preview new project page appearance', :js do
         sign_in(admin)
         gitlab_enable_admin_mode_sign_in(admin)
-      end
 
-      context 'when system header and footer messages are empty' do
-        it 'shows custom system header and footer fields' do
-          visit admin_application_settings_appearances_path
+        visit admin_application_settings_appearances_path
+        click_link "New project page"
 
-          expect(page).to have_field('appearance_header_message', with: '')
-          expect(page).to have_field('appearance_footer_message', with: '')
-          expect(page).to have_field('appearance_message_background_color')
-          expect(page).to have_field('appearance_message_font_color')
-        end
+        expect_custom_new_project_appearance(appearance)
       end
 
-      context 'when system header and footer messages are not empty' do
+      context 'Custom system header and footer' do
         before do
-          appearance.update!(header_message: 'Foo', footer_message: 'Bar')
+          sign_in(admin)
+          gitlab_enable_admin_mode_sign_in(admin)
         end
 
-        it 'shows custom system header and footer fields' do
-          visit admin_application_settings_appearances_path
+        context 'when system header and footer messages are empty' do
+          it 'shows custom system header and footer fields' do
+            visit admin_application_settings_appearances_path
 
-          expect(page).to have_field('appearance_header_message', with: appearance.header_message)
-          expect(page).to have_field('appearance_footer_message', with: appearance.footer_message)
-          expect(page).to have_field('appearance_message_background_color')
-          expect(page).to have_field('appearance_message_font_color')
+            expect(page).to have_field('appearance_header_message', with: '')
+            expect(page).to have_field('appearance_footer_message', with: '')
+            expect(page).to have_field('appearance_message_background_color')
+            expect(page).to have_field('appearance_message_font_color')
+          end
         end
-      end
-    end
 
-    it 'custom sign-in page' do
-      visit new_user_session_path
+        context 'when system header and footer messages are not empty' do
+          before do
+            appearance.update!(header_message: 'Foo', footer_message: 'Bar')
+          end
 
-      expect_custom_sign_in_appearance(appearance)
-    end
+          it 'shows custom system header and footer fields' do
+            visit admin_application_settings_appearances_path
 
-    it 'custom new project page', :js do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit new_project_path
-      click_link 'Create blank project'
+            expect(page).to have_field('appearance_header_message', with: appearance.header_message)
+            expect(page).to have_field('appearance_footer_message', with: appearance.footer_message)
+            expect(page).to have_field('appearance_message_background_color')
+            expect(page).to have_field('appearance_message_font_color')
+          end
+        end
+      end
 
-      expect_custom_new_project_appearance(appearance)
-    end
+      it 'custom sign-in page' do
+        visit new_user_session_path
 
-    context 'Profile page with custom profile image guidelines' do
-      before do
+        expect_custom_sign_in_appearance(appearance)
+      end
+
+      it 'custom new project page', :js do
         sign_in(admin)
         gitlab_enable_admin_mode_sign_in(admin)
-        visit admin_application_settings_appearances_path
-        fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines, please :smile:!'
-        click_button 'Update appearance settings'
+        visit new_project_path
+        click_link 'Create blank project'
+
+        expect_custom_new_project_appearance(appearance)
       end
 
-      it 'renders guidelines when set' do
-        sign_in create(:user)
-        visit profile_path
+      context 'Profile page with custom profile image guidelines' do
+        before do
+          sign_in(admin)
+          gitlab_enable_admin_mode_sign_in(admin)
+          visit admin_application_settings_appearances_path
+          fill_in 'appearance_profile_image_guidelines', with: 'Custom profile image guidelines, please :smile:!'
+          click_button 'Update appearance settings'
+        end
+
+        it 'renders guidelines when set' do
+          sign_in create(:user)
+          visit profile_path
 
-        expect(page).to have_content 'Custom profile image guidelines, please 😄!'
+          expect(page).to have_content 'Custom profile image guidelines, please 😄!'
+        end
       end
-    end
 
-    it 'appearance logo' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit admin_application_settings_appearances_path
+      it 'appearance logo' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
 
-      attach_file(:appearance_logo, logo_fixture)
-      click_button 'Update appearance settings'
-      expect(page).to have_css(logo_selector)
+        attach_file(:appearance_logo, logo_fixture)
+        click_button 'Update appearance settings'
+        expect(page).to have_css(logo_selector)
 
-      click_link 'Remove logo'
-      expect(page).not_to have_css(logo_selector)
-    end
+        click_link 'Remove logo'
+        expect(page).not_to have_css(logo_selector)
+      end
 
-    it 'appearance pwa icon' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit admin_application_settings_appearances_path
+      it 'appearance pwa icon' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
 
-      attach_file(:appearance_pwa_icon, logo_fixture)
-      click_button 'Update appearance settings'
-      expect(page).to have_css(pwa_icon_selector)
+        attach_file(:appearance_pwa_icon, logo_fixture)
+        click_button 'Update appearance settings'
+        expect(page).to have_css(pwa_icon_selector)
 
-      click_link 'Remove icon'
-      expect(page).not_to have_css(pwa_icon_selector)
-    end
+        click_link 'Remove icon'
+        expect(page).not_to have_css(pwa_icon_selector)
+      end
 
-    it 'header logos' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit admin_application_settings_appearances_path
+      it 'header logos' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
 
-      attach_file(:appearance_header_logo, logo_fixture)
-      click_button 'Update appearance settings'
-      expect(page).to have_css(header_logo_selector)
+        attach_file(:appearance_header_logo, logo_fixture)
+        click_button 'Update appearance settings'
+        expect(page).to have_css(header_logo_selector)
 
-      click_link 'Remove header logo'
-      expect(page).not_to have_css(header_logo_selector)
-    end
+        click_link 'Remove header logo'
+        expect(page).not_to have_css(header_logo_selector)
+      end
 
-    it 'Favicon' do
-      sign_in(admin)
-      gitlab_enable_admin_mode_sign_in(admin)
-      visit admin_application_settings_appearances_path
+      it 'Favicon' do
+        sign_in(admin)
+        gitlab_enable_admin_mode_sign_in(admin)
+        visit admin_application_settings_appearances_path
 
-      attach_file(:appearance_favicon, logo_fixture)
-      click_button 'Update appearance settings'
+        attach_file(:appearance_favicon, logo_fixture)
+        click_button 'Update appearance settings'
 
-      expect(page).to have_css('.appearance-light-logo-preview')
+        expect(page).to have_css('.appearance-light-logo-preview')
 
-      click_link 'Remove favicon'
+        click_link 'Remove favicon'
 
-      expect(page).not_to have_css('.appearance-light-logo-preview')
+        expect(page).not_to have_css('.appearance-light-logo-preview')
 
-      # allowed file types
-      attach_file(:appearance_favicon, Rails.root.join('spec', 'fixtures', 'sanitized.svg'))
-      click_button 'Update appearance settings'
+        # allowed file types
+        attach_file(:appearance_favicon, Rails.root.join('spec', 'fixtures', 'sanitized.svg'))
+        click_button 'Update appearance settings'
 
-      expect(page).to have_content 'Favicon You are not allowed to upload "svg" files, allowed types: png, ico'
+        expect(page).to have_content 'Favicon You are not allowed to upload "svg" files, allowed types: png, ico'
+      end
     end
   end