Fix new project selectors in GitLab QAfix/gb/qa/fix-new-project-selectors

3 files changed, 15 insertions, 9 deletions

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