diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-10-09 16:21:54 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-10-09 22:34:13 +1300 |
commit | 0275069cc0ecce232bd0c9e383ac5dcf086f2400 (patch) | |
tree | e5346b3f7145cae2e366e679b1ceb7566582e2b1 /qa | |
parent | bde028c4af83574b44bdcb6bde0ec18a09d15845 (diff) | |
download | gitlab-ce-0275069cc0ecce232bd0c9e383ac5dcf086f2400.tar.gz |
Move to using qa-* selectors
Adds the corresponding qa-* classes into the view files for each new
Page element we added.
Adjust the click actions to match.
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/menu/side.rb | 3 | ||||
-rw-r--r-- | qa/qa/page/project/operations/environments/index.rb | 4 | ||||
-rw-r--r-- | qa/qa/page/project/operations/environments/show.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/qa/qa/page/menu/side.rb b/qa/qa/page/menu/side.rb index d0b9bbec844..3c08f14d6da 100644 --- a/qa/qa/page/menu/side.rb +++ b/qa/qa/page/menu/side.rb @@ -9,6 +9,7 @@ module QA element :link_pipelines element :pipelines_settings_link, "title: _('CI / CD')" element :operations_kubernetes_link, "title: _('Kubernetes')" + element :operations_environments_link element :issues_link, /link_to.*shortcuts-issues/ element :issues_link_text, "Issues" element :merge_requests_link, /link_to.*shortcuts-merge_requests/ @@ -43,7 +44,7 @@ module QA def click_operations_environments hover_operations do within_submenu do - click_link('Environments') + click_element(:operations_environments_link) end end end diff --git a/qa/qa/page/project/operations/environments/index.rb b/qa/qa/page/project/operations/environments/index.rb index 62b154e5721..63965a57edd 100644 --- a/qa/qa/page/project/operations/environments/index.rb +++ b/qa/qa/page/project/operations/environments/index.rb @@ -7,12 +7,12 @@ module QA module Environments class Index < Page::Base view 'app/assets/javascripts/environments/components/environment_item.vue' do - element :environment_link, 'class="environment-name table-mobile-content"' + element :environment_link end def go_to_environment(environment_name) wait(reload: false) do - click_link(environment_name) + find(element_selector_css(:environment_link), text: environment_name).click end end end diff --git a/qa/qa/page/project/operations/environments/show.rb b/qa/qa/page/project/operations/environments/show.rb index 6736e027c5d..aa88c218c89 100644 --- a/qa/qa/page/project/operations/environments/show.rb +++ b/qa/qa/page/project/operations/environments/show.rb @@ -7,11 +7,11 @@ module QA module Environments class Show < Page::Base view 'app/views/projects/environments/_external_url.html.haml' do - element :view_deployment, %q{title: s_('Environments|Open live environment')} + element :view_deployment end def view_deployment(&block) - new_window = window_opened_by { click_on('Open live environment') } + new_window = window_opened_by { click_element(:view_deployment) } within_window(new_window, &block) if block end |