diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-24 10:31:08 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-24 10:31:08 +0300 |
commit | 07b4b3afee19ea76928fd19cad78efd0a5a9383e (patch) | |
tree | 7e8d46e9169756d9b99b25cf0a3ec2a6cbbaf44b | |
parent | 82446a2bd009e7d7481c35a142063a3973be77ce (diff) | |
parent | 09ba91edde51bb3f9cb55c86e86aa90bce3c8c9e (diff) |
Merge branch 'bvl-fix-qa-group-page' into 'master'
Use the new buttons for creating groups and projects in QA tests
Closes #39349
See merge request gitlab-org/gitlab-ce!14997
-rw-r--r-- | qa/qa/page/group/show.rb | 16 | ||||
-rw-r--r-- | qa/qa/scenario/gitlab/project/create.rb | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb index 6987c1f8f85..8080deda675 100644 --- a/qa/qa/page/group/show.rb +++ b/qa/qa/page/group/show.rb @@ -2,10 +2,6 @@ module QA module Page module Group class Show < Page::Base - def go_to_subgroups - click_link 'Subgroups' - end - def go_to_subgroup(name) click_link name end @@ -15,11 +11,19 @@ module QA end def go_to_new_subgroup - click_on 'New Subgroup' + within '.new-project-subgroup' do + find('.dropdown-toggle').click + find("li[data-value='new-subgroup']").click + end + find("input[data-action='new-subgroup']").click end def go_to_new_project - click_on 'New Project' + within '.new-project-subgroup' do + find('.dropdown-toggle').click + find("li[data-value='new-project']").click + end + find("input[data-action='new-project']").click end end end diff --git a/qa/qa/scenario/gitlab/project/create.rb b/qa/qa/scenario/gitlab/project/create.rb index 7b614bfdd94..bb3b9e19c0f 100644 --- a/qa/qa/scenario/gitlab/project/create.rb +++ b/qa/qa/scenario/gitlab/project/create.rb @@ -15,8 +15,6 @@ module QA Scenario::Gitlab::Sandbox::Prepare.perform Page::Group::Show.perform do |page| - page.go_to_subgroups - if page.has_subgroup?(Runtime::Namespace.name) page.go_to_subgroup(Runtime::Namespace.name) else |