Merge branch 'move-quality-into-tooling' into 'master'

Move quality/test_level into tooling [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!53696

lib/tasks/spec.rake

@@ -5,21 +5,21 @@ return if Rails.env.production?
 namespace :spec do
   desc 'GitLab | RSpec | Run unit tests'
   RSpec::Core::RakeTask.new(:unit, :rspec_opts) do |t, args|
-    require_dependency 'quality/test_level'
+    require_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'
+    require_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'
+    require_test_level
     t.pattern = Quality::TestLevel.new.pattern(:system)
     t.rspec_opts = args[:rspec_opts]
   end
@@ -28,4 +28,8 @@ namespace :spec do
   RSpec::Core::RakeTask.new(:api) do |t|
     t.pattern = 'spec/requests/api/**/*_spec.rb'
   end
+
+  def require_test_level
+    require_relative '../../tooling/quality/test_level'
+  end
 end

scripts/rspec_helpers.sh

@@ -109,7 +109,7 @@ function rspec_paralellized_job() {
   cp "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "${KNAPSACK_REPORT_PATH}"
 
   if [[ -z "${KNAPSACK_TEST_FILE_PATTERN}" ]]; then
-    pattern=$(ruby -r./lib/quality/test_level.rb -e "puts Quality::TestLevel.new(%(${spec_folder_prefix})).pattern(:${test_level})")
+    pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(%(${spec_folder_prefix})).pattern(:${test_level})")
     export KNAPSACK_TEST_FILE_PATTERN="${pattern}"
   fi
 

spec/spec_helper.rb

@@ -25,7 +25,7 @@ ENV["RAILS_ENV"] = 'test'
 ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true'
 ENV["RSPEC_ALLOW_INVALID_URLS"] = 'true'
 
-require File.expand_path('../config/environment', __dir__)
+require_relative '../config/environment'
 
 require 'rspec/mocks'
 require 'rspec/rails'
@@ -72,6 +72,8 @@ Dir[Rails.root.join("spec/support/shared_contexts/*.rb")].sort.each { |f| requir
 Dir[Rails.root.join("spec/support/shared_examples/*.rb")].sort.each { |f| require f }
 Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |f| require f }
 
+require_relative '../tooling/quality/test_level'
+
 quality_level = Quality::TestLevel.new
 
 RSpec.configure do |config|

spec/lib/quality/test_level_spec.rb → spec/tooling/quality/test_level_spec.rb

 # frozen_string_literal: true
 
-require 'fast_spec_helper'
+require_relative '../../../tooling/quality/test_level'
 
 RSpec.describe Quality::TestLevel do
   describe '#pattern' do
@@ -197,7 +197,7 @@ RSpec.describe Quality::TestLevel do
     it 'raises an error for an unknown level' do
       expect { subject.level_for('spec/unknown/foo_spec.rb') }
         .to raise_error(described_class::UnknownTestLevelError,
-          %r{Test level for spec/unknown/foo_spec.rb couldn't be set. Please rename the file properly or change the test level detection regexes in .+/lib/quality/test_level.rb.})
+          %r{Test level for spec/unknown/foo_spec.rb couldn't be set. Please rename the file properly or change the test level detection regexes in .+/tooling/quality/test_level.rb.})
     end
   end