diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 06:09:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 06:09:43 +0000 |
| commit | 213da19cda5309148952ab770e2a9e122fe32e22 (patch) | |
| tree | 80a48af510839497fa83625a34530543d255a957 /qa | |
| parent | 3591ecba91126089ebf916f9bd95fe497609920c (diff) | |
| download | gitlab-ce-213da19cda5309148952ab770e2a9e122fe32e22.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 3 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 4 | ||||
| -rw-r--r-- | qa/qa/resource/merge_request_from_fork.rb | 15 |
3 files changed, 12 insertions, 10 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index f320c091f7f..2671b9e6b8b 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -9,7 +9,8 @@ gem 'capybara', '~> 3.39.0' gem 'capybara-screenshot', '~> 1.0.26' gem 'rake', '~> 13', '>= 13.0.6' gem 'rspec', '~> 3.12' -gem 'selenium-webdriver', '~> 4.9', '>= 4.9.1' +# 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. +gem 'selenium-webdriver', '= 4.9.0' gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default gem 'rest-client', '~> 2.1.0' gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 7b63e25f381..278f902d8d3 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -260,7 +260,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - selenium-webdriver (4.9.1) + selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -335,7 +335,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rspec_junit_formatter (~> 0.6.0) ruby-debug-ide (~> 0.7.3) - selenium-webdriver (~> 4.9, >= 4.9.1) + selenium-webdriver (= 4.9.0) slack-notifier (~> 2.4) terminal-table (~> 3.0.2) warning (~> 1.3) diff --git a/qa/qa/resource/merge_request_from_fork.rb b/qa/qa/resource/merge_request_from_fork.rb index 512f3eb7bfc..3e849aea862 100644 --- a/qa/qa/resource/merge_request_from_fork.rb +++ b/qa/qa/resource/merge_request_from_fork.rb @@ -23,13 +23,14 @@ module QA fork.project.visit! - mr_url = Flow::Login.while_signed_in(as: fork.user) do - Page::Project::Show.perform(&:new_merge_request) - Page::MergeRequest::New.perform(&:create_merge_request) - - current_url - end - + # Ensure we are signed in as fork user and create the MR + Flow::Login.sign_in_unless_signed_in(user: fork.user) + Page::Project::Show.perform(&:new_merge_request) + Page::MergeRequest::New.perform(&:create_merge_request) + Support::WaitForRequests.wait_for_requests + mr_url = current_url + + # Sign back in as original user Flow::Login.sign_in visit(mr_url) end |