diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 15:09:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-17 15:09:14 +0300 |
| commit | 14c3ebc6364f7d5eb31cbf2e66a79ec574e88b70 (patch) | |
| tree | b05db97dc0a40721e3f99b70454d309197615428 /qa | |
| parent | db1b40c0ae61a0b647c114b22c990419de05de7a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index a08fab8efa9..8c6c4d29f62 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -408,7 +408,7 @@ module QA # Revisit after merge page re-architect is done https://gitlab.com/gitlab-org/gitlab/-/issues/300042 # To remove page refresh logic if possible wait_until_ready_to_merge - wait_until { !find_element('merge-button').text.include?('when pipeline succeeds') } # rubocop:disable Rails/NegateInclude + wait_until { !find_element('merge-button').text.include?('auto-merge') } # rubocop:disable Rails/NegateInclude click_element('merge-button') end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb index 206964cb9bf..c00dbf1b0b8 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protected_tags_spec.rb @@ -5,7 +5,7 @@ module QA describe 'Repository tags', :reliable, product_group: :source_code, quarantine: { type: :flaky, issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/438349", - only: { job: 'gdk-qa-reliable' } + only: { job: /gdk-qa-.*/ } } do let(:project) { create(:project, :with_readme, name: 'project-for-tags') } let(:developer_user) do |