Revert "Merge branch 'revert-04c3c6dd' into 'master'"

This reverts commit 744f1f2e7037f5c70c3168d9e2e89b1c327465d2, reversing
changes made to c4d930e5f54e7da07c80cc028dfc0f5c08719146.

1 files changed, 30 insertions, 14 deletions

diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
index 2eddcb3c777..c881ad4cf12 100644
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
@@ -1,7 +1,32 @@
+# frozen_string_literal: true
+
+return if Rails.env.production?
+
 Rake::Task["spec"].clear if Rake::Task.task_defined?('spec')
 
 namespace :spec do
-  desc 'GitLab | Rspec | Run request specs'
+  desc 'GitLab | RSpec | Run unit tests'
+  RSpec::Core::RakeTask.new(:unit, :rspec_opts) do |t, args|
+    require_dependency 'quality/test_level'
+    t.pattern = Quality::TestLevel.new.pattern(:unit)
+    t.rspec_opts = args[:rspec_opts]
+  end
+
+  desc 'GitLab | RSpec | Run integration tests'
+  RSpec::Core::RakeTask.new(:integration, :rspec_opts) do |t, args|
+    require_dependency 'quality/test_level'
+    t.pattern = Quality::TestLevel.new.pattern(:integration)
+    t.rspec_opts = args[:rspec_opts]
+  end
+
+  desc 'GitLab | RSpec | Run system tests'
+  RSpec::Core::RakeTask.new(:system, :rspec_opts) do |t, args|
+    require_dependency 'quality/test_level'
+    t.pattern = Quality::TestLevel.new.pattern(:system)
+    t.rspec_opts = args[:rspec_opts]
+  end
+
+  desc '[Deprecated] Use the "bin/rspec --tag api" instead'
   task :api do
     cmds = [
       %w(rake gitlab:setup),
@@ -10,7 +35,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GitLab | Rspec | Run feature specs'
+  desc '[Deprecated] Use the "spec:system" task instead'
   task :feature do
     cmds = [
       %w(rake gitlab:setup),
@@ -19,7 +44,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GitLab | Rspec | Run model specs'
+  desc '[Deprecated] Use "bin/rspec spec/models" instead'
   task :models do
     cmds = [
       %w(rake gitlab:setup),
@@ -28,7 +53,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GitLab | Rspec | Run service specs'
+  desc '[Deprecated] Use "bin/rspec spec/services" instead'
   task :services do
     cmds = [
       %w(rake gitlab:setup),
@@ -37,7 +62,7 @@ namespace :spec do
     run_commands(cmds)
   end
 
-  desc 'GitLab | Rspec | Run lib specs'
+  desc '[Deprecated] Use "bin/rspec spec/lib" instead'
   task :lib do
     cmds = [
       %w(rake gitlab:setup),
@@ -45,15 +70,6 @@ namespace :spec do
     ]
     run_commands(cmds)
   end
-
-  desc 'GitLab | Rspec | Run other specs'
-  task :other do
-    cmds = [
-      %w(rake gitlab:setup),
-      %w(rspec spec --tag ~@api --tag ~@feature --tag ~@models --tag ~@lib --tag ~@services)
-    ]
-    run_commands(cmds)
-  end
 end
 
 desc "GitLab | Run specs"