VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-20 16:46:17 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-07-07 21:10:07 +00:00
parent 4d4c33870f
commit 90ffe7528b
98 changed files with 1017 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qa/Gemfile
View File

@ -27,7 +27,6 @@ gem 'zeitwerk', '~> 2.7', '>= 2.7.3'
gem 'influxdb-client', '~> 3.2'
gem 'terminal-table', '~> 4.0.0', require: false
gem 'slack-notifier', '~> 2.4', require: false
gem 'googleauth', '~> 1.9.0', require: false # see: https://gitlab.com/gitlab-org/gitlab/-/issues/449019
gem 'fog-google', '~> 1.25', require: false
gem "warning", "~> 1.5"

10
qa/Gemfile.lock
View File

@ -175,11 +175,14 @@ GEM
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.40.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-env (2.1.1)
google-cloud-env (2.3.1)
base64 (~> 0.2)
faraday (>= 1.0, < 3.a)
googleauth (1.9.2)
google-logging-utils (0.2.0)
googleauth (1.14.0)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
@ -386,7 +389,6 @@ DEPENDENCIES
gitlab-qa (~> 15, >= 15.5.0)
gitlab-utils!
gitlab_quality-test_tooling (~> 2.15.3)
googleauth (~> 1.9.0)
influxdb-client (~> 3.2)
junit_merge (~> 0.1.2)
knapsack (~> 4.0)

8
qa/qa/page/component/note.rb
View File

@ -97,11 +97,11 @@ module QA
click_element 'expand-replies-button'
end
def has_comment?(comment_text)
def has_comment?(comment_text, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
has_element?(
'noteable-note-container',
text: comment_text,
wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME
wait: wait
)
end
@ -167,13 +167,13 @@ module QA
def start_review_with_comment(text)
fill_editor_element('comment-field', text)
click_element('start-review-button')
has_comment?(text)
has_comment?(text, 3)
end
def add_comment_to_review(text)
fill_editor_element('comment-field', text)
click_element('add-to-review-button')
has_comment?(text)
has_comment?(text, 3)
end
def toggle_comments(position)

10
qa/qa/page/merge_request/show.rb
View File

@ -180,8 +180,14 @@ module QA
end
end
all_elements('review-drawer-toggle', minimum: 1).first.click
click_element('submit-review-button')
retry_until(sleep_interval: 2, max_attempts: 5, message: "Retry closing review drawer") do
if has_element?('review-drawer-toggle', wait: 2)
all_elements('review-drawer-toggle', minimum: 1).first.click
end
click_element('submit-review-button')
has_no_element?('review-drawer-toggle', wait: 2)
end
# After clicking the button, wait for the review bar to disappear
# before moving on to the next part of the test

6
qa/qa/support/api.rb
View File

@ -15,6 +15,7 @@ module QA
HTTP_STATUS_NOT_FOUND = 404
HTTP_STATUS_TOO_MANY_REQUESTS = 429
HTTP_STATUS_SERVER_ERROR = 500
HTTP_STATUS_SERVICE_UNAVAILABLE = 503
def post(url, payload, args = {})
request_args = {
@ -197,7 +198,10 @@ module QA
end
def fatal_response?(response_code)
[HTTP_STATUS_UNAUTHORIZED, HTTP_STATUS_SERVER_ERROR, HTTP_STATUS_BAD_REQUEST].include?(response_code)
[HTTP_STATUS_UNAUTHORIZED,
HTTP_STATUS_SERVER_ERROR,
HTTP_STATUS_BAD_REQUEST,
HTTP_STATUS_SERVICE_UNAVAILABLE].include?(response_code)
end
end
end