diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-21 11:31:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-21 11:31:38 +0000 |
| commit | 2e46a584b671f5eb06b7e9c37523d7300882d44b (patch) | |
| tree | eab6b4d8eccf20e7668f2fa37217900e2b1a7d19 | |
| parent | 43a6758460a5f50f8a85df9285a0f25a8806543b (diff) | |
| parent | a6ac872b86561db1e8f66d1bc0239fa6123dd9a1 (diff) | |
| download | gitlab-ce-2e46a584b671f5eb06b7e9c37523d7300882d44b.tar.gz | |
Merge branch 'fix/gb/qa/fix-new-project-selectors' into 'master'
Fix new project selectors in GitLab QA
Closes gitlab-qa#57
See merge request !13012
| -rw-r--r-- | qa/qa.rb | 9 | ||||
| -rw-r--r-- | qa/qa/page/dashboard/groups.rb (renamed from qa/qa/page/main/groups.rb) | 6 | ||||
| -rw-r--r-- | qa/qa/page/group/show.rb | 11 | ||||
| -rw-r--r-- | qa/qa/page/main/menu.rb | 7 | ||||
| -rw-r--r-- | qa/qa/scenario/gitlab/project/create.rb | 4 |
5 files changed, 25 insertions, 12 deletions
@@ -48,7 +48,14 @@ module QA module Main autoload :Entry, 'qa/page/main/entry' autoload :Menu, 'qa/page/main/menu' - autoload :Groups, 'qa/page/main/groups' + end + + module Dashboard + autoload :Groups, 'qa/page/dashboard/groups' + end + + module Group + autoload :Show, 'qa/page/group/show' end module Project diff --git a/qa/qa/page/main/groups.rb b/qa/qa/page/dashboard/groups.rb index 169c5ebc967..3690f40dcfe 100644 --- a/qa/qa/page/main/groups.rb +++ b/qa/qa/page/dashboard/groups.rb @@ -1,9 +1,11 @@ module QA module Page - module Main + module Dashboard class Groups < Page::Base def prepare_test_namespace - return if page.has_content?(Runtime::Namespace.name) + if page.has_content?(Runtime::Namespace.name) + return click_link(Runtime::Namespace.name) + end click_on 'New group' diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb new file mode 100644 index 00000000000..296c311d7c6 --- /dev/null +++ b/qa/qa/page/group/show.rb @@ -0,0 +1,11 @@ +module QA + module Page + module Group + class Show < Page::Base + def go_to_new_project + click_link 'New Project' + end + end + end + end +end diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index f7c2086d0dd..7ce4e9009f5 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -14,13 +14,6 @@ module QA within_user_menu { click_link 'Admin area' } end - def go_to_new_project - within_user_menu do - find('.header-new-dropdown-toggle').click - click_link('New project') - end - end - def sign_out within_user_menu do find('.header-user-dropdown-toggle').click diff --git a/qa/qa/scenario/gitlab/project/create.rb b/qa/qa/scenario/gitlab/project/create.rb index 99d0fc42a94..b860701c304 100644 --- a/qa/qa/scenario/gitlab/project/create.rb +++ b/qa/qa/scenario/gitlab/project/create.rb @@ -13,8 +13,8 @@ module QA def perform Page::Main::Menu.act { go_to_groups } - Page::Main::Groups.act { prepare_test_namespace } - Page::Main::Menu.act { go_to_new_project } + Page::Dashboard::Groups.act { prepare_test_namespace } + Page::Group::Show.act { go_to_new_project } Page::Project::New.perform do |page| page.choose_test_namespace |