Add latest changes from gitlab-org/gitlab@master

6 files changed, 76 insertions, 6 deletions

diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row_spec.js b/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row_spec.js
index d4b69d3e8e8..09e2c35d449 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row_spec.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row_spec.js
@@ -318,7 +318,6 @@ describe('tags list row', () => {
         expect(findDeleteButton().props('item').extraAttrs).toMatchObject({
           class: 'gl-text-red-500!',
           'data-testid': 'single-delete-button',
-          'data-qa-selector': 'tag_delete_button',
         });
 
         expect(findDeleteButton().text()).toBe(REMOVE_TAG_BUTTON_TITLE);
diff --git a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
index 08e2de6c18f..250b33cbb14 100644
--- a/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/infrastructure_registry/components/shared/__snapshots__/package_list_row_spec.js.snap
@@ -24,7 +24,7 @@ exports[`packages_list_row renders 1`] = `
           >
             <gl-link-stub
               class="gl-text-body gl-min-w-0"
-              data-qa-selector="package_link"
+              data-testid="details-link"
               href="foo"
             >
               <gl-truncate-stub
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
index 0443fb85dc9..7a488a74dcb 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
@@ -32,7 +32,6 @@ exports[`packages_list_row renders 1`] = `
             <router-link-stub
               ariacurrentvalue="page"
               class="gl-text-body gl-min-w-0"
-              data-qa-selector="package_link"
               data-testid="details-link"
               event="click"
               tag="a"
diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb
index ff4a312f1b5..49adba22ebe 100644
--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -357,4 +357,46 @@ RSpec.describe CommitsHelper do
 
     it { is_expected.to eq(expected_path) }
   end
+
+  describe '#local_committed_date' do
+    let(:commit) { build(:commit, committed_date: time) }
+    let(:user) { build(:user) }
+    let(:time) { Time.find_zone('UTC').parse('2023-01-01') }
+
+    subject { helper.local_committed_date(commit, user).to_s }
+
+    it { is_expected.to eq('2023-01-01') }
+
+    context 'when user has a custom timezone' do
+      let(:user) { build(:user, timezone: 'America/Mexico_City') }
+
+      it 'selects timezone of the user' do
+        is_expected.to eq('2022-12-31')
+      end
+    end
+
+    context "when user doesn't have a preferred timezone" do
+      let(:user) { build(:user, timezone: nil) }
+
+      it 'uses system timezone' do
+        is_expected.to eq('2023-01-01')
+      end
+    end
+
+    context 'when user timezone is not supported' do
+      let(:user) { build(:user, timezone: 'unknown') }
+
+      it 'uses system timezone' do
+        is_expected.to eq('2023-01-01')
+      end
+    end
+
+    context 'when user is missing' do
+      let(:user) { nil }
+
+      it 'uses system timezone' do
+        is_expected.to eq('2023-01-01')
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/github_import_spec.rb b/spec/lib/gitlab/github_import_spec.rb
index c4ed4b09f04..898bc40ec1f 100644
--- a/spec/lib/gitlab/github_import_spec.rb
+++ b/spec/lib/gitlab/github_import_spec.rb
@@ -61,7 +61,7 @@ RSpec.describe Gitlab::GithubImport, feature_category: :importers do
 
         expect(described_class::ClientPool)
           .to receive(:new)
-          .with(token_pool: %w[foo bar], host: nil, parallel: true, per_page: 100)
+          .with(token_pool: %w[foo bar 123], host: nil, parallel: true, per_page: 100)
 
         described_class.new_client_for(project)
       end
diff --git a/spec/views/projects/commits/show.html.haml_spec.rb b/spec/views/projects/commits/show.html.haml_spec.rb
index e5e9906a798..9393ba046dc 100644
--- a/spec/views/projects/commits/show.html.haml_spec.rb
+++ b/spec/views/projects/commits/show.html.haml_spec.rb
@@ -3,8 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe 'projects/commits/show.html.haml' do
-  let(:project) { create(:project, :repository) }
-  let(:commits) { [project.commit] }
+  let_it_be(:project) { create(:project, :repository) }
+
+  let(:commits) { [commit] }
+  let(:commit) { project.commit }
   let(:path) { 'path/to/doc.md' }
 
   before do
@@ -32,4 +34,32 @@ RSpec.describe 'projects/commits/show.html.haml' do
       expect(rendered).to have_link(href: "#{project_commits_path(project, path)}?format=atom")
     end
   end
+
+  context 'commits date headers' do
+    let(:user) { build(:user, timezone: timezone) }
+    let(:committed_date) { Time.find_zone('UTC').parse('2023-01-01') }
+
+    before do
+      allow(view).to receive(:current_user).and_return(user)
+      allow(commit).to receive(:committed_date).and_return(committed_date)
+
+      render
+    end
+
+    context 'when timezone is UTC' do
+      let(:timezone) { 'UTC' }
+
+      it "renders commit date header in user's timezone" do
+        expect(rendered).to include('data-day="2023-01-01"')
+      end
+    end
+
+    context 'when timezone is UTC-6' do
+      let(:timezone) { 'America/Mexico_City' }
+
+      it "renders commit date header in user's timezone" do
+        expect(rendered).to include('data-day="2022-12-31"')
+      end
+    end
+  end
 end