diff options
author | Mark Lapierre <mlapierre@gitlab.com> | 2019-07-12 05:18:42 +0000 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-07-12 05:18:42 +0000 |
commit | b51ec1fb01922fe8b81ae3098a1578fb1622fabc (patch) | |
tree | 01acbe2a9325e7e5d7a64e385906f29f8dc576c0 /qa/qa | |
parent | ecffca5d92353d55aaf8f984737fa617782310e0 (diff) | |
parent | 3281e6db23d8f1ea6757af6eb71e87ed7a93c130 (diff) | |
download | gitlab-ce-b51ec1fb01922fe8b81ae3098a1578fb1622fabc.tar.gz |
Merge branch 'qa-dd-data-qa-selector-replacement' into 'master'
Introduce data-qa-selector to supplant .qa-class
See merge request gitlab-org/gitlab-ce!28906
Diffstat (limited to 'qa/qa')
-rw-r--r-- | qa/qa/page/element.rb | 4 | ||||
-rw-r--r-- | qa/qa/page/main/menu.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/page/element.rb b/qa/qa/page/element.rb index 7a01320901d..9e6fd2fdd4f 100644 --- a/qa/qa/page/element.rb +++ b/qa/qa/page/element.rb @@ -28,7 +28,7 @@ module QA end def selector_css - ".#{selector}" + %Q([data-qa-selector="#{@name}"],.#{selector}) end def expression @@ -40,7 +40,7 @@ module QA end def matches?(line) - !!(line =~ expression) + !!(line =~ /["']#{name}['"]|#{expression}/) end end end diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 9c99e43d4c0..c98d85d7911 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -12,7 +12,7 @@ module QA view 'app/views/layouts/header/_default.html.haml' do element :navbar, required: true element :user_avatar, required: true - element :user_menu, '.dropdown-menu' # rubocop:disable QA/ElementWithPattern + element :user_menu, required: true end view 'app/views/layouts/nav/_dashboard.html.haml' do @@ -82,7 +82,7 @@ module QA private def within_top_menu - page.within('.qa-navbar') do + within_element(:navbar) do yield end end @@ -91,7 +91,7 @@ module QA within_top_menu do click_element :user_avatar - page.within('.dropdown-menu') do + within_element(:user_menu) do yield end end |