summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorDan Davison <ddavison@gitlab.com>2019-07-18 11:57:26 +0000
committerSanad Liaquat <sliaquat@gitlab.com>2019-07-18 11:57:26 +0000
commitc5783cb59d8a2d91333e6f9527802944594686de (patch)
treea5d58af0f5c524b000b71ef54db2811cca86de35 /qa
parent9967b2d1ee3644ed22fb441cc754f4e6764a7718 (diff)
downloadgitlab-ce-c5783cb59d8a2d91333e6f9527802944594686de.tar.gz
Refactor common Page Objects to use data tags
Common usages within GitLab QA include Login Page, navigation bars and layouts
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/main/login.rb4
-rw-r--r--qa/qa/page/main/menu.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index ffce3b72275..c2b0482d789 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -6,7 +6,7 @@ module QA
class Login < Page::Base
view 'app/views/devise/passwords/edit.html.haml' do
element :password_field
- element :password_confirmation
+ element :password_confirmation_field
element :change_password_button
end
@@ -154,7 +154,7 @@ module QA
return unless has_content?('Change your password')
fill_element :password_field, Runtime::User.password
- fill_element :password_confirmation, Runtime::User.password
+ fill_element :password_confirmation_field, Runtime::User.password
click_element :change_password_button
end
end
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index c98d85d7911..d86d554356e 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -6,7 +6,7 @@ module QA
class Menu < Page::Base
view 'app/views/layouts/header/_current_user_dropdown.html.haml' do
element :sign_out_link
- element :settings_link, 'link_to s_("CurrentUser|Settings")' # rubocop:disable QA/ElementWithPattern
+ element :settings_link
end
view 'app/views/layouts/header/_default.html.haml' do