Merge branch '220924-identify-non-app-or-lib-specs-to-be-tested-in-rspec-foss-impact' into 'master'

Add mapping for specs to be tested in `rspec foss-impact`

Closes #220924

See merge request gitlab-org/gitlab!35209

spec/tooling/lib/tooling/test_file_finder_spec.rb

@@ -88,6 +88,62 @@ RSpec.describe Tooling::TestFileFinder do
       end
     end
 
+    context 'when given a factory file' do
+      let(:file) { 'spec/factories/users.rb' }
+
+      it 'returns spec/factories_spec.rb file' do
+        expect(subject.test_files).to contain_exactly('spec/factories_spec.rb')
+      end
+    end
+
+    context 'when given an ee factory file' do
+      let(:file) { 'ee/spec/factories/users.rb' }
+
+      it 'returns spec/factories_spec.rb file' do
+        expect(subject.test_files).to contain_exactly('spec/factories_spec.rb')
+      end
+    end
+
+    context 'when given db/structure.sql' do
+      let(:file) { 'db/structure.sql' }
+
+      it 'returns spec/db/schema_spec.rb' do
+        expect(subject.test_files).to contain_exactly('spec/db/schema_spec.rb')
+      end
+    end
+
+    context 'when given an initializer' do
+      let(:file) { 'config/initializers/action_mailer_hooks.rb' }
+
+      it 'returns the matching initializer spec' do
+        expect(subject.test_files).to contain_exactly('spec/initializers/action_mailer_hooks_spec.rb')
+      end
+    end
+
+    context 'when given a migration file' do
+      let(:file) { 'db/migrate/20191023152913_add_default_and_free_plans.rb' }
+
+      it 'returns the matching migration spec' do
+        test_files = %w[
+          spec/migrations/add_default_and_free_plans_spec.rb
+          spec/migrations/20191023152913_add_default_and_free_plans_spec.rb
+        ]
+        expect(subject.test_files).to contain_exactly(*test_files)
+      end
+    end
+
+    context 'when given a post-migration file' do
+      let(:file) { 'db/post_migrate/20200608072931_backfill_imported_snippet_repositories.rb' }
+
+      it 'returns the matching migration spec' do
+        test_files = %w[
+          spec/migrations/backfill_imported_snippet_repositories_spec.rb
+          spec/migrations/20200608072931_backfill_imported_snippet_repositories_spec.rb
+        ]
+        expect(subject.test_files).to contain_exactly(*test_files)
+      end
+    end
+
     context 'with foss_test_only: true' do
       subject { Tooling::TestFileFinder.new(file, foss_test_only: true) }
 

tooling/lib/tooling/test_file_finder.rb

@@ -12,7 +12,7 @@ module Tooling
     end
 
     def test_files
-      impacted_tests = ee_impact | non_ee_impact
+      impacted_tests = ee_impact | non_ee_impact | either_impact
       impacted_tests.impact(@file)
     end
 
@@ -23,20 +23,22 @@ module Tooling
     class ImpactedTestFile
       attr_reader :pattern_matchers
 
-      def initialize
+      def initialize(prefix: nil)
         @pattern_matchers = {}
+        @prefix = prefix
 
         yield self if block_given?
       end
 
       def associate(pattern, &block)
-        @pattern_matchers[pattern] = block
+        @pattern_matchers[%r{^#{@prefix}#{pattern}}] = block
       end
 
       def impact(file)
         @pattern_matchers.each_with_object(Set.new) do |(pattern, block), result|
           if (match = pattern.match(file))
-            result << block.call(match)
+            test_files = block.call(match)
+            result.merge(Array(test_files))
           end
         end.to_a
       end
@@ -54,24 +56,37 @@ module Tooling
     end
 
     def ee_impact
-      ImpactedTestFile.new do |impact|
+      ImpactedTestFile.new(prefix: EE_PREFIX) do |impact|
         unless foss_test_only
-          impact.associate(%r{^#{EE_PREFIX}app/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/#{match[1]}_spec.rb" }
-          impact.associate(%r{^#{EE_PREFIX}app/(.*/)ee/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/#{match[1]}#{match[2]}_spec.rb" }
-          impact.associate(%r{^#{EE_PREFIX}lib/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/lib/#{match[1]}_spec.rb" }
-          impact.associate(%r{^#{EE_PREFIX}spec/(.+)_spec.rb$}) { |match| match[0] }
+          impact.associate(%r{app/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/#{match[1]}_spec.rb" }
+          impact.associate(%r{app/(.*/)ee/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/#{match[1]}#{match[2]}_spec.rb" }
+          impact.associate(%r{lib/(.+)\.rb$}) { |match| "#{EE_PREFIX}spec/lib/#{match[1]}_spec.rb" }
         end
 
-        impact.associate(%r{^#{EE_PREFIX}(?!spec)(.*/)ee/(.+)\.rb$}) { |match| "spec/#{match[1]}#{match[2]}_spec.rb" }
-        impact.associate(%r{^#{EE_PREFIX}spec/(.*/)ee/(.+)\.rb$}) { |match| "spec/#{match[1]}#{match[2]}.rb" }
+        impact.associate(%r{(?!spec)(.*/)ee/(.+)\.rb$}) { |match| "spec/#{match[1]}#{match[2]}_spec.rb" }
+        impact.associate(%r{spec/(.*/)ee/(.+)\.rb$}) { |match| "spec/#{match[1]}#{match[2]}.rb" }
       end
     end
 
     def non_ee_impact
       ImpactedTestFile.new do |impact|
-        impact.associate(%r{^app/(.+)\.rb$}) { |match| "spec/#{match[1]}_spec.rb" }
-        impact.associate(%r{^(tooling/)?lib/(.+)\.rb$}) { |match| "spec/#{match[1]}lib/#{match[2]}_spec.rb" }
-        impact.associate(%r{^spec/(.+)_spec.rb$}) { |match| match[0] }
+        impact.associate(%r{app/(.+)\.rb$}) { |match| "spec/#{match[1]}_spec.rb" }
+        impact.associate(%r{(tooling/)?lib/(.+)\.rb$}) { |match| "spec/#{match[1]}lib/#{match[2]}_spec.rb" }
+        impact.associate(%r{config/initializers/(.+).rb$}) { |match| "spec/initializers/#{match[1]}_spec.rb" }
+        impact.associate('db/structure.sql') { 'spec/db/schema_spec.rb' }
+        impact.associate(%r{db/(?:post_)?migrate/([0-9]+)_(.+).rb$}) do |match|
+          [
+            "spec/migrations/#{match[2]}_spec.rb",
+            "spec/migrations/#{match[1]}_#{match[2]}_spec.rb"
+          ]
+        end
+      end
+    end
+
+    def either_impact
+      ImpactedTestFile.new(prefix: %r{^(#{EE_PREFIX})?}) do |impact|
+        impact.associate(%r{spec/(.+)_spec.rb$}) { |match| match[0] }
+        impact.associate(%r{spec/factories/.+\.rb$}) { 'spec/factories_spec.rb' }
       end
     end
   end