summaryrefslogtreecommitdiff
path: root/qa/qa/page/main/login.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 09:10:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-09 09:10:17 +0000
commitad0265eead72a624ce7a020847db4f0f0c877e57 (patch)
tree206e0564b02aa9530e3c95f70eb10a77e074bdf0 /qa/qa/page/main/login.rb
parent4dfc8711171fe0c04bc6b8b224687603026dea46 (diff)
downloadgitlab-ce-ad0265eead72a624ce7a020847db4f0f0c877e57.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/page/main/login.rb')
-rw-r--r--qa/qa/page/main/login.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 0638097a7b7..8eb28eb53e7 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -159,7 +159,13 @@ module QA
fill_element :login_field, user.username
fill_element :password_field, user.password
- click_element :sign_in_button, !skip_page_validation && Page::Main::Menu
+ click_element :sign_in_button
+
+ Page::Main::Terms.perform do |terms|
+ terms.accept_terms if terms.visible?
+ end
+
+ Page::Main::Menu.validate_elements_present! unless skip_page_validation
end
def set_initial_password_if_present