From fb423da27ddb5877b0575af42fb04ce836b21f09 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Fri, 5 Sep 2025 08:38:08 +1000 Subject: [PATCH 1/3] Use chrome 133 --- .gitlab/ci/version.yml | 2 +- ee/spec/features/work_items/detail/work_item_detail_spec.rb | 2 +- .../features/work_items/epics/epic_work_item_detail_spec.rb | 4 ++-- qa/Dockerfile | 2 +- spec/features/group_variables_spec.rb | 2 +- spec/features/snippets/user_creates_snippet_spec.rb | 4 +--- spec/features/work_items/detail/work_item_detail_spec.rb | 4 ++-- spec/support/capybara.rb | 3 --- 8 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml index b27315b73c1b8e..58665cf08f15c9 100644 --- a/.gitlab/ci/version.yml +++ b/.gitlab/ci/version.yml @@ -1,6 +1,6 @@ variables: BUILD_OS: "debian" - CHROME_VERSION: "123" + CHROME_VERSION: "133" DOCKER_VERSION: "27.4.1" EXIFTOOL_VERSION: "12.60" GCLOUD_VERSION: "413" diff --git a/ee/spec/features/work_items/detail/work_item_detail_spec.rb b/ee/spec/features/work_items/detail/work_item_detail_spec.rb index a4f1d432dd0cce..76b4ed9728f34e 100644 --- a/ee/spec/features/work_items/detail/work_item_detail_spec.rb +++ b/ee/spec/features/work_items/detail/work_item_detail_spec.rb @@ -5,7 +5,7 @@ RSpec.describe 'Work item detail', :js, feature_category: :team_planning do include ListboxHelpers - let_it_be_with_reload(:user) { create(:user) } + let_it_be_with_refind(:user) { create(:user) } let_it_be(:group) { create(:group, :nested) } let_it_be(:root_group) { group.root_ancestor } diff --git a/ee/spec/features/work_items/epics/epic_work_item_detail_spec.rb b/ee/spec/features/work_items/epics/epic_work_item_detail_spec.rb index 4d96aaec99219c..4f930c7cf8cb21 100644 --- a/ee/spec/features/work_items/epics/epic_work_item_detail_spec.rb +++ b/ee/spec/features/work_items/epics/epic_work_item_detail_spec.rb @@ -6,8 +6,8 @@ include DragTo include ListboxHelpers - let_it_be_with_reload(:user) { create(:user) } - let_it_be_with_reload(:user2) { create(:user, name: 'John') } + let_it_be_with_refind(:user) { create(:user) } + let_it_be_with_refind(:user2) { create(:user, name: 'John') } let_it_be(:group) { create(:group, :nested, developers: user) } let_it_be(:label) { create(:group_label, group: group) } diff --git a/qa/Dockerfile b/qa/Dockerfile index 63d08e6468175e..e0f3f5047dd0d7 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_OS=debian -ARG CHROME_VERSION=123 +ARG CHROME_VERSION=133 ARG DOCKER_VERSION=24.0.5 ARG GCLOUD_VERSION=413 ARG GIT_VERSION=2.45 diff --git a/spec/features/group_variables_spec.rb b/spec/features/group_variables_spec.rb index c2222be1e901e3..189ec46871ec80 100644 --- a/spec/features/group_variables_spec.rb +++ b/spec/features/group_variables_spec.rb @@ -10,7 +10,7 @@ before do group.add_owner(user) - gitlab_sign_in(user) + sign_in(user) visit page_path wait_for_requests diff --git a/spec/features/snippets/user_creates_snippet_spec.rb b/spec/features/snippets/user_creates_snippet_spec.rb index e49b4707e2ed86..4245839cfd93b4 100644 --- a/spec/features/snippets/user_creates_snippet_spec.rb +++ b/spec/features/snippets/user_creates_snippet_spec.rb @@ -146,9 +146,7 @@ def fill_form # not anymore as requests when they come straight from memory cache. # accept_confirm is needed because of https://gitlab.com/gitlab-org/gitlab/-/issues/262102 reqs = inspect_requests do - visit("#{link}?ran=#{SecureRandom.base64(20)}") do - page.driver.browser.switch_to.alert.accept - end + visit("#{link}?ran=#{SecureRandom.base64(20)}") end expect(reqs.first.status_code).to eq(200) end diff --git a/spec/features/work_items/detail/work_item_detail_spec.rb b/spec/features/work_items/detail/work_item_detail_spec.rb index 6b67e5d933e347..3a86cba20029ce 100644 --- a/spec/features/work_items/detail/work_item_detail_spec.rb +++ b/spec/features/work_items/detail/work_item_detail_spec.rb @@ -5,8 +5,8 @@ RSpec.describe 'Work item detail', :js, feature_category: :team_planning do include ListboxHelpers - let_it_be_with_reload(:user) { create(:user) } - let_it_be_with_reload(:user2) { create(:user, name: 'John') } + let_it_be_with_refind(:user) { create(:user) } + let_it_be_with_refind(:user2) { create(:user, name: 'John') } let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, :public, :repository, group: group) } diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index 10bf75f577f0f8..7d58a81ede1577 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -63,9 +63,6 @@ # Disable /dev/shm use in CI. See https://gitlab.com/gitlab-org/gitlab/issues/4252 options.add_argument("disable-dev-shm-usage") if ENV['CI'] || ENV['CI_SERVER'] - # Explicitly set user-data-dir to prevent crashes. See https://gitlab.com/gitlab-org/gitlab-foss/issues/58882#note_179811508 - options.add_argument("user-data-dir=/tmp/chrome") if ENV['CI'] || ENV['CI_SERVER'] - # Set chrome default download path if ENV['DEFAULT_CHROME_DOWNLOAD_PATH'] options.add_preference("download.default_directory", ENV['DEFAULT_CHROME_DOWNLOAD_PATH']) -- GitLab From 10eaa1eb96e03b7f44feca6d87b91d2a148b5068 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Fri, 5 Sep 2025 08:54:20 +1000 Subject: [PATCH 2/3] Apply 1 suggestion(s) to 1 file(s) --- .gitlab/ci/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml index 58665cf08f15c9..ac6bb678feefe2 100644 --- a/.gitlab/ci/version.yml +++ b/.gitlab/ci/version.yml @@ -4,7 +4,7 @@ variables: DOCKER_VERSION: "27.4.1" EXIFTOOL_VERSION: "12.60" GCLOUD_VERSION: "413" - GIT_VERSION: "2.49" + GIT_VERSION: "2.50" GO_VERSION: "1.23" GRAPHICSMAGICK_VERSION: "1.3.36" HELM_VERSION: "3.16" -- GitLab From a0a8182e5c0fb01cd4058fc5cef8e6269992f9b6 Mon Sep 17 00:00:00 2001 From: Jay McCure Date: Fri, 5 Sep 2025 09:01:26 +1000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- .gitlab/ci/version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml index ac6bb678feefe2..3d7ac30ab2d579 100644 --- a/.gitlab/ci/version.yml +++ b/.gitlab/ci/version.yml @@ -1,10 +1,10 @@ variables: BUILD_OS: "debian" - CHROME_VERSION: "133" + CHROME_VERSION: "123" DOCKER_VERSION: "27.4.1" EXIFTOOL_VERSION: "12.60" GCLOUD_VERSION: "413" - GIT_VERSION: "2.50" + GIT_VERSION: "2.51" GO_VERSION: "1.23" GRAPHICSMAGICK_VERSION: "1.3.36" HELM_VERSION: "3.16" -- GitLab