Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

2 files changed, 11 insertions, 55 deletions

diff --git a/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb b/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb
index 50fc7bb0753..d922bc1f4a0 100644
--- a/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb
+++ b/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb
@@ -18,65 +18,21 @@ RSpec.describe 'User sees feature flag list', :js do
 
   context 'with legacy feature flags' do
     before do
-      create_flag(project, 'ci_live_trace', false).tap do |feature_flag|
+      create_flag(project, 'ci_live_trace', false, version: :legacy_flag).tap do |feature_flag|
         create_scope(feature_flag, 'review/*', true)
       end
-      create_flag(project, 'drop_legacy_artifacts', false)
-      create_flag(project, 'mr_train', true).tap do |feature_flag|
+      create_flag(project, 'drop_legacy_artifacts', false, version: :legacy_flag)
+      create_flag(project, 'mr_train', true, version: :legacy_flag).tap do |feature_flag|
         create_scope(feature_flag, 'production', false)
       end
     end
 
-    it 'user sees the first flag' do
-      visit(project_feature_flags_path(project))
-
-      within_feature_flag_row(1) do
-        expect(page.find('.js-feature-flag-id')).to have_content('^1')
-        expect(page.find('.feature-flag-name')).to have_content('ci_live_trace')
-        expect_status_toggle_button_not_to_be_checked
-
-        within_feature_flag_scopes do
-          expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(1)')).to have_content('*')
-          expect(page.find('[data-qa-selector="feature-flag-scope-info-badge"]:nth-child(2)')).to have_content('review/*')
-        end
-      end
-    end
-
-    it 'user sees the second flag' do
-      visit(project_feature_flags_path(project))
-
-      within_feature_flag_row(2) do
-        expect(page.find('.js-feature-flag-id')).to have_content('^2')
-        expect(page.find('.feature-flag-name')).to have_content('drop_legacy_artifacts')
-        expect_status_toggle_button_not_to_be_checked
-
-        within_feature_flag_scopes do
-          expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(1)')).to have_content('*')
-        end
-      end
-    end
-
-    it 'user sees the third flag' do
-      visit(project_feature_flags_path(project))
-
-      within_feature_flag_row(3) do
-        expect(page.find('.js-feature-flag-id')).to have_content('^3')
-        expect(page.find('.feature-flag-name')).to have_content('mr_train')
-        expect_status_toggle_button_to_be_checked
-
-        within_feature_flag_scopes do
-          expect(page.find('[data-qa-selector="feature-flag-scope-info-badge"]:nth-child(1)')).to have_content('*')
-          expect(page.find('[data-qa-selector="feature-flag-scope-muted-badge"]:nth-child(2)')).to have_content('production')
-        end
-      end
-    end
-
-    it 'user sees the status toggle disabled' do
+    it 'shows empty page' do
       visit(project_feature_flags_path(project))
 
-      within_feature_flag_row(1) do
-        expect_status_toggle_button_to_be_disabled
-      end
+      expect(page).to have_text 'Get started with feature flags'
+      expect(page).to have_selector('.btn-confirm', text: 'New feature flag')
+      expect(page).to have_selector('[data-qa-selector="configure_feature_flags_button"]', text: 'Configure')
     end
   end
 
diff --git a/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb b/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb
index a435e565ff1..9c03a26abc8 100644
--- a/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb
+++ b/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb
@@ -73,16 +73,16 @@ RSpec.describe 'User updates feature flag', :js do
   context 'with a legacy feature flag' do
     let!(:feature_flag) do
       create_flag(project, 'ci_live_trace', true,
-                  description: 'For live trace feature')
+                  description: 'For live trace feature',
+                  version: :legacy_flag)
     end
 
     let!(:scope) { create_scope(feature_flag, 'review/*', true) }
 
-    it 'the user cannot edit the flag' do
+    it 'shows not found error' do
       visit(edit_project_feature_flag_path(project, feature_flag))
 
-      expect(page).to have_text 'This feature flag is read-only, and it will be removed in 14.0.'
-      expect(page).to have_css('button.js-ff-submit.disabled')
+      expect(page).to have_text 'Page Not Found'
     end
   end
 end