Merge branch 'rs-qa-sandbox-group' into 'master'

Make use of a `gitlab-qa-sandbox` group if available

See merge request gitlab-org/gitlab-ce!14682

8 files changed, 138 insertions, 14 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index db9d8c42fde..eb6f922d0d3 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -31,9 +31,17 @@ module QA
     # GitLab instance scenarios.
     #
     module Gitlab
+      module Group
+        autoload :Create, 'qa/scenario/gitlab/group/create'
+      end
+
       module Project
         autoload :Create, 'qa/scenario/gitlab/project/create'
       end
+
+      module Sandbox
+        autoload :Prepare, 'qa/scenario/gitlab/sandbox/prepare'
+      end
     end
   end
 
@@ -55,6 +63,7 @@ module QA
     end
 
     module Group
+      autoload :New, 'qa/page/group/new'
       autoload :Show, 'qa/page/group/show'
     end
 
diff --git a/qa/qa/page/dashboard/groups.rb b/qa/qa/page/dashboard/groups.rb
index 3690f40dcfe..083d2e1ab16 100644
--- a/qa/qa/page/dashboard/groups.rb
+++ b/qa/qa/page/dashboard/groups.rb
@@ -2,19 +2,22 @@ module QA
   module Page
     module Dashboard
       class Groups < Page::Base
-        def prepare_test_namespace
-          if page.has_content?(Runtime::Namespace.name)
-            return click_link(Runtime::Namespace.name)
-          end
+        def filter_by_name(name)
+          fill_in 'Filter by name...', with: name
+        end
 
-          click_on 'New group'
+        def has_group?(name)
+          filter_by_name(name)
+
+          page.has_link?(name)
+        end
 
-          fill_in 'group_path', with: Runtime::Namespace.name
-          fill_in 'group_description',
-                  with: "QA test run at #{Runtime::Namespace.time}"
-          choose 'Private'
+        def go_to_group(name)
+          click_link name
+        end
 
-          click_button 'Create group'
+        def go_to_new_group
+          click_on 'New group'
         end
       end
     end
diff --git a/qa/qa/page/group/new.rb b/qa/qa/page/group/new.rb
new file mode 100644
index 00000000000..cb743a7bf11
--- /dev/null
+++ b/qa/qa/page/group/new.rb
@@ -0,0 +1,23 @@
+module QA
+  module Page
+    module Group
+      class New < Page::Base
+        def set_path(path)
+          fill_in 'group_path', with: path
+        end
+
+        def set_description(description)
+          fill_in 'group_description', with: description
+        end
+
+        def set_visibility(visibility)
+          choose visibility
+        end
+
+        def create
+          click_button 'Create group'
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/group/show.rb b/qa/qa/page/group/show.rb
index 296c311d7c6..6987c1f8f85 100644
--- a/qa/qa/page/group/show.rb
+++ b/qa/qa/page/group/show.rb
@@ -2,8 +2,24 @@ 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
+
+        def has_subgroup?(name)
+          page.has_link?(name)
+        end
+
+        def go_to_new_subgroup
+          click_on 'New Subgroup'
+        end
+
         def go_to_new_project
-          click_link 'New Project'
+          click_on 'New Project'
         end
       end
     end
diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb
index e4910b63a14..996286430b9 100644
--- a/qa/qa/runtime/namespace.rb
+++ b/qa/qa/runtime/namespace.rb
@@ -10,6 +10,10 @@ module QA
       def name
         'qa_test_' + time.strftime('%d_%m_%Y_%H-%M-%S')
       end
+
+      def sandbox_name
+        'gitlab-qa-sandbox'
+      end
     end
   end
 end
diff --git a/qa/qa/scenario/gitlab/group/create.rb b/qa/qa/scenario/gitlab/group/create.rb
new file mode 100644
index 00000000000..8e6c7c7ad80
--- /dev/null
+++ b/qa/qa/scenario/gitlab/group/create.rb
@@ -0,0 +1,27 @@
+require 'securerandom'
+
+module QA
+  module Scenario
+    module Gitlab
+      module Group
+        class Create < Scenario::Template
+          attr_writer :path, :description
+
+          def initialize
+            @path = Runtime::Namespace.name
+            @description = "QA test run at #{Runtime::Namespace.time}"
+          end
+
+          def perform
+            Page::Group::New.perform do |group|
+              group.set_path(@path)
+              group.set_description(@description)
+              group.set_visibility('Private')
+              group.create
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/scenario/gitlab/project/create.rb b/qa/qa/scenario/gitlab/project/create.rb
index b860701c304..7b614bfdd94 100644
--- a/qa/qa/scenario/gitlab/project/create.rb
+++ b/qa/qa/scenario/gitlab/project/create.rb
@@ -12,9 +12,23 @@ module QA
           end
 
           def perform
-            Page::Main::Menu.act { go_to_groups }
-            Page::Dashboard::Groups.act { prepare_test_namespace }
-            Page::Group::Show.act { go_to_new_project }
+            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
+                page.go_to_new_subgroup
+
+                Scenario::Gitlab::Group::Create.perform do |group|
+                  group.path = Runtime::Namespace.name
+                end
+              end
+
+              page.go_to_new_project
+            end
 
             Page::Project::New.perform do |page|
               page.choose_test_namespace
diff --git a/qa/qa/scenario/gitlab/sandbox/prepare.rb b/qa/qa/scenario/gitlab/sandbox/prepare.rb
new file mode 100644
index 00000000000..990de456e20
--- /dev/null
+++ b/qa/qa/scenario/gitlab/sandbox/prepare.rb
@@ -0,0 +1,28 @@
+module QA
+  module Scenario
+    module Gitlab
+      module Sandbox
+        # Ensure we're in our sandbox namespace, either by navigating to it or
+        # by creating it if it doesn't yet exist
+        class Prepare < Scenario::Template
+          def perform
+            Page::Main::Menu.act { go_to_groups }
+
+            Page::Dashboard::Groups.perform do |page|
+              if page.has_group?(Runtime::Namespace.sandbox_name)
+                page.go_to_group(Runtime::Namespace.sandbox_name)
+              else
+                page.go_to_new_group
+
+                Scenario::Gitlab::Group::Create.perform do |group|
+                  group.path = Runtime::Namespace.sandbox_name
+                  group.description = 'QA sandbox'
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end