diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 03:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 03:08:51 +0300 |
| commit | 92ab5f89fe0935677ca8b0c78099228f1da192ac (patch) | |
| tree | 4b0afa1911e9d1aaefad658f4fbc8e504f20d5c5 /qa | |
| parent | d5012fff67191be53070d024a89195a666a581ed (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 4 | ||||
| -rw-r--r-- | qa/qa/page/main/login.rb | 2 | ||||
| -rw-r--r-- | qa/qa/page/main/menu.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index 1f63be4234b..3c1dd90f8f3 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'gitlab-qa', '~> 9', '>= 9.1.2', require: 'gitlab/qa' +gem 'gitlab-qa', '~> 10', '>= 10.1.0', require: 'gitlab/qa' gem 'activesupport', '~> 6.1.7.2' # This should stay in sync with the root's Gemfile gem 'allure-rspec', '~> 2.20.0' gem 'capybara', '~> 3.39.0' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 3d4ab76ef8c..9cdf54e0920 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -102,7 +102,7 @@ GEM gitlab (4.18.0) httparty (~> 0.18) terminal-table (>= 1.5.1) - gitlab-qa (9.1.2) + gitlab-qa (10.1.0) activesupport (~> 6.1) gitlab (~> 4.18.0) http (~> 5.0) @@ -318,7 +318,7 @@ DEPENDENCIES faraday-retry (~> 2.1) fog-core (= 2.1.0) fog-google (~> 1.19) - gitlab-qa (~> 9, >= 9.1.2) + gitlab-qa (~> 10, >= 10.1.0) influxdb-client (~> 2.9) knapsack (~> 4.0) nokogiri (~> 1.14, >= 1.14.3) diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb index 9fb1179373d..2fce357c877 100644 --- a/qa/qa/page/main/login.rb +++ b/qa/qa/page/main/login.rb @@ -107,7 +107,7 @@ module QA # Happens on clean GDK installations when seeded root admin password is expired # def set_up_new_password_if_required(user:, skip_page_validation:) - return unless has_content?('Set up new password') + return unless has_content?('Set up new password', wait: 1) Profile::Password.perform do |new_password_page| password = user&.password || Runtime::User.password diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index fa8c0508142..b254b135dda 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -161,7 +161,7 @@ module QA end def signed_in_as_user?(user) - return false if has_no_personal_area? + return false unless has_personal_area? within_user_menu do has_element?(:user_profile_link, text: /#{user.username}/) |