Add latest changes from gitlab-org/gitlab@master

10 files changed, 34 insertions, 122 deletions

diff --git a/spec/features/discussion_comments/issue_spec.rb b/spec/features/discussion_comments/issue_spec.rb
index 6187a13bf96..ebb57b37918 100644
--- a/spec/features/discussion_comments/issue_spec.rb
+++ b/spec/features/discussion_comments/issue_spec.rb
@@ -8,8 +8,6 @@ RSpec.describe 'Thread Comments Issue', :js do
   let(:issue) { create(:issue, project: project) }
 
   before do
-    stub_feature_flags(remove_comment_close_reopen: false)
-
     project.add_maintainer(user)
     sign_in(user)
 
diff --git a/spec/features/discussion_comments/merge_request_spec.rb b/spec/features/discussion_comments/merge_request_spec.rb
index a0febe9d9ab..f60d7da6a30 100644
--- a/spec/features/discussion_comments/merge_request_spec.rb
+++ b/spec/features/discussion_comments/merge_request_spec.rb
@@ -9,7 +9,6 @@ RSpec.describe 'Thread Comments Merge Request', :js do
 
   before do
     stub_feature_flags(remove_resolve_note: false)
-    stub_feature_flags(remove_comment_close_reopen: false)
 
     project.add_maintainer(user)
     sign_in(user)
diff --git a/spec/features/issues/issue_state_spec.rb b/spec/features/issues/issue_state_spec.rb
index 409f498798b..d5a115433aa 100644
--- a/spec/features/issues/issue_state_spec.rb
+++ b/spec/features/issues/issue_state_spec.rb
@@ -42,15 +42,9 @@ RSpec.describe 'issue state', :js do
   end
 
   describe 'when open', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/297348' do
-    let(:open_issue) { create(:issue, project: project) }
-
-    it_behaves_like 'page with comment and close button', 'Close issue' do
-      def setup
-        visit project_issue_path(project, open_issue)
-      end
-    end
-
     context 'when clicking the top `Close issue` button', :aggregate_failures do
+      let(:open_issue) { create(:issue, project: project) }
+
       before do
         visit project_issue_path(project, open_issue)
       end
@@ -59,8 +53,9 @@ RSpec.describe 'issue state', :js do
     end
 
     context 'when clicking the bottom `Close issue` button', :aggregate_failures do
+      let(:open_issue) { create(:issue, project: project) }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit project_issue_path(project, open_issue)
       end
 
@@ -69,15 +64,9 @@ RSpec.describe 'issue state', :js do
   end
 
   describe 'when closed', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/297201' do
-    let(:closed_issue) { create(:issue, project: project, state: 'closed') }
-
-    it_behaves_like 'page with comment and close button', 'Reopen issue' do
-      def setup
-        visit project_issue_path(project, closed_issue)
-      end
-    end
-
     context 'when clicking the top `Reopen issue` button', :aggregate_failures do
+      let(:closed_issue) { create(:issue, project: project, state: 'closed') }
+
       before do
         visit project_issue_path(project, closed_issue)
       end
@@ -86,8 +75,9 @@ RSpec.describe 'issue state', :js do
     end
 
     context 'when clicking the bottom `Reopen issue` button', :aggregate_failures do
+      let(:closed_issue) { create(:issue, project: project, state: 'closed') }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit project_issue_path(project, closed_issue)
       end
 
diff --git a/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb b/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
index ab3ef7c1ac0..70951982c22 100644
--- a/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
+++ b/spec/features/merge_request/user_closes_reopens_merge_request_state_spec.rb
@@ -12,15 +12,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
   end
 
   describe 'when open' do
-    let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
-
-    it_behaves_like 'page with comment and close button', 'Close merge request' do
-      def setup
-        visit merge_request_path(open_merge_request)
-      end
-    end
-
     context 'when clicking the top `Close merge request` link', :aggregate_failures do
+      let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
       before do
         visit merge_request_path(open_merge_request)
       end
@@ -40,8 +34,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
     end
 
     context 'when clicking the bottom `Close merge request` button', :aggregate_failures do
+      let(:open_merge_request) { create(:merge_request, source_project: project, target_project: project) }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit merge_request_path(open_merge_request)
       end
 
@@ -61,22 +56,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
   end
 
   describe 'when closed' do
-    let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
-
-    it_behaves_like 'page with comment and close button', 'Close merge request' do
-      def setup
-        visit merge_request_path(closed_merge_request)
-
-        within '.detail-page-header' do
-          click_button 'Toggle dropdown'
-          click_link 'Reopen merge request'
-        end
-
-        wait_for_requests
-      end
-    end
-
     context 'when clicking the top `Reopen merge request` link', :aggregate_failures do
+      let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
+
       before do
         visit merge_request_path(closed_merge_request)
       end
@@ -96,8 +78,9 @@ RSpec.describe 'User closes/reopens a merge request', :js, quarantine: 'https://
     end
 
     context 'when clicking the bottom `Reopen merge request` button', :aggregate_failures do
+      let(:closed_merge_request) { create(:merge_request, source_project: project, target_project: project, state: 'closed') }
+
       before do
-        stub_feature_flags(remove_comment_close_reopen: false)
         visit merge_request_path(closed_merge_request)
       end
 
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index e17521e1d02..0f8daaf8e15 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -69,13 +69,7 @@ RSpec.describe 'Task Lists', :js do
         wait_for_requests
 
         expect(page).to have_selector(".md .task-list .task-list-item .task-list-item-checkbox")
-      end
-
-      it_behaves_like 'page with comment and close button', 'Close issue' do
-        def setup
-          visit_issue(project, issue)
-          wait_for_requests
-        end
+        expect(page).to have_selector('.btn-close')
       end
 
       it 'is only editable by author' do
diff --git a/spec/frontend/jira_connect/components/app_spec.js b/spec/frontend/jira_connect/components/app_spec.js
index d11b66b2089..c789c2d6ce5 100644
--- a/spec/frontend/jira_connect/components/app_spec.js
+++ b/spec/frontend/jira_connect/components/app_spec.js
@@ -24,9 +24,6 @@ describe('JiraConnectApp', () => {
     wrapper = extendedWrapper(
       shallowMount(JiraConnectApp, {
         store,
-        provide: {
-          glFeatures: { newJiraConnectUi: true },
-        },
         ...options,
       }),
     );
@@ -49,7 +46,6 @@ describe('JiraConnectApp', () => {
       beforeEach(() => {
         createComponent({
           provide: {
-            glFeatures: { newJiraConnectUi: true },
             usersPath: '/users',
           },
         });
@@ -72,18 +68,6 @@ describe('JiraConnectApp', () => {
       });
     });
 
-    describe('newJiraConnectUi is false', () => {
-      it('does not render new UI', () => {
-        createComponent({
-          provide: {
-            glFeatures: { newJiraConnectUi: false },
-          },
-        });
-
-        expect(findHeader().exists()).toBe(false);
-      });
-    });
-
     it.each`
       errorMessage    | errorShouldRender
       ${'Test error'} | ${true}
diff --git a/spec/lib/gitlab/utils/usage_data_spec.rb b/spec/lib/gitlab/utils/usage_data_spec.rb
index e964e695828..b493576735e 100644
--- a/spec/lib/gitlab/utils/usage_data_spec.rb
+++ b/spec/lib/gitlab/utils/usage_data_spec.rb
@@ -203,6 +203,12 @@ RSpec.describe Gitlab::Utils::UsageData do
         expect(described_class.redis_usage_data { raise ::Redis::CommandError } ).to eq(-1)
       end
 
+      it 'returns the fallback when Redis HLL raises any error' do
+        stub_const("Gitlab::Utils::UsageData::FALLBACK", 15)
+
+        expect(described_class.redis_usage_data { raise Gitlab::UsageDataCounters::HLLRedisCounter::CategoryMismatch } ).to eq(15)
+      end
+
       it 'returns the evaluated block when given' do
         expect(described_class.redis_usage_data { 1 }).to eq(1)
       end
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index 1c43ef25f14..d6783f5e004 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -329,6 +329,17 @@ RSpec.describe API::Jobs do
             .to include('Content-Type' => 'application/json',
                         'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
         end
+
+        context 'when artifacts are locked' do
+          it 'allows access to expired artifact' do
+            pipeline.artifacts_locked!
+            job.update!(artifacts_expire_at: Time.now - 7.days)
+
+            get_artifact_file(artifact)
+
+            expect(response).to have_gitlab_http_status(:ok)
+          end
+        end
       end
     end
 
diff --git a/spec/services/packages/create_event_service_spec.rb b/spec/services/packages/create_event_service_spec.rb
index f7bab0e5a9f..122f1e88ad0 100644
--- a/spec/services/packages/create_event_service_spec.rb
+++ b/spec/services/packages/create_event_service_spec.rb
@@ -57,18 +57,6 @@ RSpec.describe Packages::CreateEventService do
     end
 
     shared_examples 'redis package unique event creation' do |originator_type, expected_scope|
-      context 'with feature flag disable' do
-        before do
-          stub_feature_flags(collect_package_events_redis: false)
-        end
-
-        it 'does not track the event' do
-          expect(::Gitlab::UsageDataCounters::HLLRedisCounter).not_to receive(:track_event)
-
-          subject
-        end
-      end
-
       it 'tracks the event' do
         expect(::Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event).with(/package/, values: user.id)
 
@@ -77,18 +65,6 @@ RSpec.describe Packages::CreateEventService do
     end
 
     shared_examples 'redis package count event creation' do |originator_type, expected_scope|
-      context 'with feature flag disabled' do
-        before do
-          stub_feature_flags(collect_package_events_redis: false)
-        end
-
-        it 'does not track the event' do
-          expect(::Gitlab::UsageDataCounters::PackageEventCounter).not_to receive(:count)
-
-          subject
-        end
-      end
-
       it 'tracks the event' do
         expect(::Gitlab::UsageDataCounters::PackageEventCounter).to receive(:count).at_least(:once)
 
diff --git a/spec/support/shared_examples/features/comment_and_close_button_shared_examples.rb b/spec/support/shared_examples/features/comment_and_close_button_shared_examples.rb
deleted file mode 100644
index 4ee2840ed9f..00000000000
--- a/spec/support/shared_examples/features/comment_and_close_button_shared_examples.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples 'page with comment and close button' do |button_text|
-  context 'when remove_comment_close_reopen feature flag is enabled' do
-    before do
-      stub_feature_flags(remove_comment_close_reopen: true)
-      setup
-    end
-
-    it "does not show #{button_text} button" do
-      within '.note-form-actions' do
-        expect(page).not_to have_button(button_text)
-      end
-    end
-  end
-
-  context 'when remove_comment_close_reopen feature flag is disabled' do
-    before do
-      stub_feature_flags(remove_comment_close_reopen: false)
-      setup
-    end
-
-    it "shows #{button_text} button" do
-      within '.note-form-actions' do
-        expect(page).to have_button(button_text)
-      end
-    end
-  end
-end