Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 39 deletions

diff --git a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
index e1b139c1b3b..cea9056cd93 100644
--- a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
@@ -230,7 +230,7 @@ describe 'Merge request > User creates image diff notes', :js do
       it_behaves_like 'onion skin'
     end
 
-    describe 'swipe view' do
+    describe 'swipe view', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/209999' do
       before do
         switch_to_swipe_view
       end
diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb
index 69681da6b2a..815cf3b9c58 100644
--- a/spec/features/projects/active_tabs_spec.rb
+++ b/spec/features/projects/active_tabs_spec.rb
@@ -7,8 +7,6 @@ describe 'Project active tab' do
   let(:project) { create(:project, :repository) }
 
   before do
-    stub_feature_flags(analytics_pages_under_project_analytics_sidebar: { enabled: false, thing: project })
-
     project.add_maintainer(user)
     sign_in(user)
   end
@@ -45,7 +43,7 @@ describe 'Project active tab' do
 
     it_behaves_like 'page has active tab', 'Repository'
 
-    %w(Files Commits Graph Compare Charts Branches Tags).each do |sub_menu|
+    %w(Files Commits Graph Compare Branches Tags).each do |sub_menu|
       context "on project Repository/#{sub_menu}" do
         before do
           click_tab(sub_menu)
@@ -124,29 +122,23 @@ describe 'Project active tab' do
     end
   end
 
-  context 'when `analytics_pages_under_project_analytics_sidebar` feature flag is enabled' do
+  context 'on project Analytics' do
     before do
-      stub_feature_flags(analytics_pages_under_project_analytics_sidebar: { enabled: true, thing: project })
+      visit charts_project_graph_path(project, 'master')
     end
 
-    context 'on project Analytics' do
-      before do
-        visit charts_project_graph_path(project, 'master')
-      end
+    context 'on project Analytics/Repository Analytics' do
+      it_behaves_like 'page has active tab', _('Analytics')
+      it_behaves_like 'page has active sub tab', _('Repository')
+    end
 
-      context 'on project Analytics/Repository Analytics' do
-        it_behaves_like 'page has active tab', _('Analytics')
-        it_behaves_like 'page has active sub tab', _('Repository')
+    context 'on project Analytics/Cycle Analytics' do
+      before do
+        click_tab(_('CI / CD'))
       end
 
-      context 'on project Analytics/Cycle Analytics' do
-        before do
-          click_tab(_('CI / CD'))
-        end
-
-        it_behaves_like 'page has active tab', _('Analytics')
-        it_behaves_like 'page has active sub tab', _('CI / CD')
-      end
+      it_behaves_like 'page has active tab', _('Analytics')
+      it_behaves_like 'page has active sub tab', _('CI / CD')
     end
   end
 end
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index 33c2e65633e..2d629ef538a 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -7,8 +7,6 @@ describe 'User uses shortcuts', :js do
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(analytics_pages_under_project_analytics_sidebar: { enabled: false, thing: project })
-
     project.add_maintainer(user)
     sign_in(user)
 
@@ -119,8 +117,8 @@ describe 'User uses shortcuts', :js do
       find('body').native.send_key('g')
       find('body').native.send_key('d')
 
-      expect(page).to have_active_navigation('Repository')
-      expect(page).to have_active_sub_navigation('Charts')
+      expect(page).to have_active_navigation(_('Analytics'))
+      expect(page).to have_active_sub_navigation(_('Repository'))
     end
   end
 
@@ -211,18 +209,4 @@ describe 'User uses shortcuts', :js do
       expect(page).to have_active_navigation('Wiki')
     end
   end
-
-  context 'when `analytics_pages_under_project_analytics_sidebar` feature flag is enabled' do
-    before do
-      stub_feature_flags(analytics_pages_under_project_analytics_sidebar: { enabled: true, thing: project })
-    end
-
-    it 'redirects to the repository charts page' do
-      find('body').native.send_key('g')
-      find('body').native.send_key('d')
-
-      expect(page).to have_active_navigation(_('Analytics'))
-      expect(page).to have_active_sub_navigation(_('Repository'))
-    end
-  end
 end