Refactor rake tasks for tests

3 files changed, 25 insertions, 29 deletions

diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 90b966dd645..af68cb96ed9 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -45,7 +45,7 @@ Feature: Project Source Browse Files
     Then I am redirected to the new file on new branch
     And I should see its new content
 
-  @javascript @tricky
+  @javascript
   Scenario: I can create file in empty repo
     Given I own an empty project
     And I visit my empty project page
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index bee22300298..831746815d7 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -1,7 +1,7 @@
 Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
 
 namespace :spec do
-  desc 'GITLAB | Run request specs'
+  desc 'GitLab | Rspec | Run request specs'
   task :api do
     cmds = [
       %W(rake gitlab:setup),
@@ -10,7 +10,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GITLAB | Run feature specs'
+  desc 'GitLab | Rspec | Run feature specs'
   task :feature do
     cmds = [
       %W(rake gitlab:setup),
@@ -19,7 +19,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GITLAB | Run other specs'
+  desc 'GitLab | Rspec | Run other specs'
   task :other do
     cmds = [
       %W(rake gitlab:setup),
@@ -29,7 +29,7 @@ namespace :spec do
   end
 end
 
-desc "GITLAB | Run specs"
+desc "GitLab | Run specs"
 task :spec do
   cmds = [
     %W(rake gitlab:setup),
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