diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-10 10:32:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-10 10:32:17 +0000 |
| commit | b0cb64a171dbc0c91ddf00dc65656efd9ce3a7ad (patch) | |
| tree | 26e7f49cffa794dd0105c8d5ef1d9cf4c988c64f | |
| parent | 6b76c19b4098084420f27def39078e8328f3979c (diff) | |
| parent | 1eeb70843f1bcdc9e396dbf1d265879dbea31653 (diff) | |
| download | gitlab-ce-b0cb64a171dbc0c91ddf00dc65656efd9ce3a7ad.tar.gz | |
Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'
Fix QA test scenario for creating a new project
Closes gitlab-qa#56
See merge request !12747
| -rw-r--r-- | qa/qa.rb | 1 | ||||
| -rw-r--r-- | qa/qa/page/main/menu.rb | 7 | ||||
| -rw-r--r-- | qa/qa/page/main/projects.rb | 16 | ||||
| -rw-r--r-- | qa/qa/scenario/gitlab/project/create.rb | 3 |
4 files changed, 8 insertions, 19 deletions
@@ -49,7 +49,6 @@ module QA autoload :Entry, 'qa/page/main/entry' autoload :Menu, 'qa/page/main/menu' autoload :Groups, 'qa/page/main/groups' - autoload :Projects, 'qa/page/main/projects' end module Project diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 7ce4e9009f5..f7c2086d0dd 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -14,6 +14,13 @@ 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/page/main/projects.rb b/qa/qa/page/main/projects.rb deleted file mode 100644 index 28d3a424022..00000000000 --- a/qa/qa/page/main/projects.rb +++ /dev/null @@ -1,16 +0,0 @@ -module QA - module Page - module Main - class Projects < Page::Base - def go_to_new_project - ## - # There are 'New Project' and 'New project' buttons on the projects - # page, so we can't use `click_on`. - # - button = find('a', text: /^new project$/i) - button.click - end - end - end - end -end diff --git a/qa/qa/scenario/gitlab/project/create.rb b/qa/qa/scenario/gitlab/project/create.rb index 38522714e64..99d0fc42a94 100644 --- a/qa/qa/scenario/gitlab/project/create.rb +++ b/qa/qa/scenario/gitlab/project/create.rb @@ -14,8 +14,7 @@ module QA def perform Page::Main::Menu.act { go_to_groups } Page::Main::Groups.act { prepare_test_namespace } - Page::Main::Menu.act { go_to_projects } - Page::Main::Projects.act { go_to_new_project } + Page::Main::Menu.act { go_to_new_project } Page::Project::New.perform do |page| page.choose_test_namespace |