diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
commit | 07557a946bac1b596a28293d39e7bd2581ff828b (patch) | |
tree | f725f935880b122862880f9f18d18fb74a7f758b /qa/qa/page/group/show.rb | |
parent | bf01452cc361842dab7442a9ad868213d53bd212 (diff) | |
parent | 03f386c2b20f95272e4846f5ecab54fd8b2566e0 (diff) | |
download | gitlab-ce-qa-define-selectors.tar.gz |
Merge branch 'master' into 'qa-define-selectors'qa-define-selectors
# Conflicts:
# qa/qa/page/group/show.rb
Diffstat (limited to 'qa/qa/page/group/show.rb')
-rw-r--r-- | qa/qa/page/group/show.rb | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb index ac1fd9b5f90..82985703e54 100644 --- a/qa/qa/page/group/show.rb +++ b/qa/qa/page/group/show.rb @@ -3,23 +3,14 @@ module QA module Group class Show < Page::Base view 'app/views/groups/show.html.haml' do - element :dropdown_toggle, '.dropdown-toggle' - element :new_project_subgroup, '.new-project-subgroup' - - element :new_project_toggle, - /%li.+ data: { value: "new\-project"/ - element :new_project_button, - /%input.+ data: { action: "new\-project"/ - - element :new_subgroup_toggle, - /%li.+ data: { value: "new\-subgroup"/ - # TODO: input[data-action='new-subgroup'] seems to be handled by JS? - # See app/assets/javascripts/groups/new_group_child.js - end - - view 'app/views/shared/groups/_search_form.html.haml' do - element :filter_by_name, - "placeholder: s_('GroupsTree|Filter by name...')" + element :new_project_or_subgroup_dropdown, '.new-project-subgroup' + element :new_project_or_subgroup_dropdown_toggle, '.dropdown-toggle' + element :new_project_option, /%li.*data:.*value: "new-project"/ + element :new_project_button, /%input.*data:.*action: "new-project"/ + element :new_subgroup_option, /%li.*data:.*value: "new-subgroup"/ + + # data-value and data-action get modified by JS for subgroup + element :new_subgroup_button, /%input.*\.js-new-group-child/ end def go_to_subgroup(name) |