Refactor rake tasks for tests

1 files changed, 20 insertions, 24 deletions

diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
index 4aefc18ce14..c8881be0954 100644
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
@@ -1,34 +1,30 @@
 Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach')
 
-desc "GITLAB | Run spinach"
-task :spinach do
-  tags = if ENV['SEMAPHORE']
-           '~@tricky'
-         else
-           '~@semaphore'
-         end
-
-  cmds = [
-    %W(rake gitlab:setup),
-    %W(spinach --tags #{tags}),
-  ]
-  run_commands(cmds)
-end
+namespace :spinach do
+  desc "GitLab | Spinach | Run project spinach features"
+  task :project do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
+    ]
+    run_commands(cmds)
+  end
 
-desc "GITLAB | Run project spinach features"
-task :spinach_project do
-  cmds = [
-    %W(rake gitlab:setup),
-    %W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
-  ]
-  run_commands(cmds)
+  desc "GitLab | Spinach | Run other spinach features"
+  task :other do
+    cmds = [
+      %W(rake gitlab:setup),
+      %W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
+    ]
+    run_commands(cmds)
+  end
 end
 
-desc "GITLAB | Run other spinach features"
-task :spinach_other do
+desc "GitLab | Run spinach"
+task :spinach do
   cmds = [
     %W(rake gitlab:setup),
-    %W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
+    %W(spinach),
   ]
   run_commands(cmds)
 end