1 files changed, 19 insertions, 17 deletions
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index 1f6ceca80bd..b760a607f7e 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -1,18 +1,11 @@
-namespace :testing do
-  desc 'GITLAB | Run model specs'
-  task :models do
-    cmds = [
-      %W(rake gitlab:setup),
-      %W(rspec spec --tag @models)
-    ]
-    run_commands(cmds)
-  end
+Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
 
+namespace :spec do
   desc 'GITLAB | Run feature specs'
-  task :features do
+  task :api do
     cmds = [
       %W(rake gitlab:setup),
-      %W(rspec spec --tag @features)
+      %W(rspec spec --tag @api)
     ]
     run_commands(cmds)
   end
@@ -21,15 +14,24 @@ namespace :testing do
   task :other do
     cmds = [
       %W(rake gitlab:setup),
-      %W(rspec spec --tag ~@models --tag ~@features)
+      %W(rspec spec --tag ~@api)
     ]
     run_commands(cmds)
   end
+end
+
+desc "GITLAB | Run specs"
+task :spec do
+  cmds = [
+    %W(rake gitlab:setup),
+    %W(rspec spec),
+  ]
+  run_commands(cmds)
+end
 
-  def run_commands(cmds)
-    cmds.each do |cmd|
-      system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
-      raise "#{cmd} failed!" unless $?.exitstatus.zero?
-    end
+def run_commands(cmds)
+  cmds.each do |cmd|
+    system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd)
+    raise "#{cmd} failed!" unless $?.exitstatus.zero?
   end
 end