1 files changed, 90 insertions, 19 deletions

diff --git a/spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb b/spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb
index 72e02547938..e1f35bedebb 100644
--- a/spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb
+++ b/spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb
@@ -6,33 +6,63 @@ require_relative '../../../../../tooling/lib/tooling/mappings/js_to_system_specs
 RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :tooling do
   # We set temporary folders, and those readers give access to those folder paths
   attr_accessor :js_base_folder, :system_specs_base_folder
+  attr_accessor :changed_files_file, :predictive_tests_file
+
+  let(:changed_files_pathname)        { changed_files_file.path    }
+  let(:predictive_tests_pathname)     { predictive_tests_file.path }
+  let(:changed_files_content)         { "changed_file1 changed_file2" }
+  let(:predictive_tests_content) { "previously_matching_spec.rb" }
+
+  let(:instance) do
+    described_class.new(
+      changed_files_pathname,
+      predictive_tests_pathname,
+      system_specs_base_folder: system_specs_base_folder,
+      js_base_folder: js_base_folder
+    )
+  end
 
   around do |example|
+    self.changed_files_file    = Tempfile.new('changed_files_file')
+    self.predictive_tests_file = Tempfile.new('predictive_tests_file')
+
     Dir.mktmpdir do |tmp_js_base_folder|
       Dir.mktmpdir do |tmp_system_specs_base_folder|
         self.system_specs_base_folder = tmp_system_specs_base_folder
         self.js_base_folder           = tmp_js_base_folder
 
-        example.run
+        # See https://ruby-doc.org/stdlib-1.9.3/libdoc/tempfile/rdoc/
+        #     Tempfile.html#class-Tempfile-label-Explicit+close
+        begin
+          example.run
+        ensure
+          changed_files_file.close
+          predictive_tests_file.close
+          changed_files_file.unlink
+          predictive_tests_file.unlink
+        end
       end
     end
   end
 
+  before do
+    # We write into the temp files initially, to later check how the code modified those files
+    File.write(changed_files_pathname, changed_files_content)
+    File.write(predictive_tests_pathname, predictive_tests_content)
+  end
+
   describe '#execute' do
-    let(:instance) do
-      described_class.new(
-        system_specs_base_folder: system_specs_base_folder,
-        js_base_folder: js_base_folder
-      )
-    end
+    subject { instance.execute }
 
-    subject { instance.execute(changed_files) }
+    before do
+      File.write(changed_files_pathname, changed_files.join(' '))
+    end
 
     context 'when no JS files were changed' do
       let(:changed_files) { [] }
 
-      it 'returns nothing' do
-        expect(subject).to match_array([])
+      it 'does not change the output file' do
+        expect { subject }.not_to change { File.read(predictive_tests_pathname) }
       end
     end
 
@@ -40,8 +70,8 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
       let(:changed_files) { ["#{js_base_folder}/issues/secret_values.js"] }
 
       context 'when the JS files are not present on disk' do
-        it 'returns nothing' do
-          expect(subject).to match_array([])
+        it 'does not change the output file' do
+          expect { subject }.not_to change { File.read(predictive_tests_pathname) }
         end
       end
 
@@ -52,8 +82,8 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
         end
 
         context 'when no system specs match the JS keyword' do
-          it 'returns nothing' do
-            expect(subject).to match_array([])
+          it 'does not change the output file' do
+            expect { subject }.not_to change { File.read(predictive_tests_pathname) }
           end
         end
 
@@ -63,8 +93,10 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
             File.write("#{system_specs_base_folder}/confidential_issues/issues_spec.rb", "a test")
           end
 
-          it 'returns something' do
-            expect(subject).to match_array(["#{system_specs_base_folder}/confidential_issues/issues_spec.rb"])
+          it 'adds the new specs to the output file' do
+            expect { subject }.to change { File.read(predictive_tests_pathname) }
+              .from(predictive_tests_content)
+              .to("#{predictive_tests_content} #{system_specs_base_folder}/confidential_issues/issues_spec.rb")
           end
         end
       end
@@ -72,12 +104,13 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
   end
 
   describe '#filter_files' do
-    subject { described_class.new(js_base_folder: js_base_folder).filter_files(changed_files) }
+    subject { instance.filter_files }
 
     before do
       File.write("#{js_base_folder}/index.js", "index.js")
       File.write("#{js_base_folder}/index-with-ee-in-it.js", "index-with-ee-in-it.js")
       File.write("#{js_base_folder}/index-with-jh-in-it.js", "index-with-jh-in-it.js")
+      File.write(changed_files_pathname, changed_files.join(' '))
     end
 
     context 'when no files were changed' do
@@ -117,7 +150,7 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
   end
 
   describe '#construct_js_keywords' do
-    subject { described_class.new.construct_js_keywords(js_files) }
+    subject { described_class.new(changed_files_file, predictive_tests_file).construct_js_keywords(js_files) }
 
     let(:js_files) do
       %w[
@@ -129,11 +162,49 @@ RSpec.describe Tooling::Mappings::JsToSystemSpecsMappings, feature_category: :to
     it 'returns a singularized keyword based on the first folder the file is in' do
       expect(subject).to eq(%w[board query])
     end
+
+    context 'when the files are under the pages folder' do
+      let(:js_files) do
+        %w[
+          app/assets/javascripts/pages/boards/issue_board_filters.js
+          ee/app/assets/javascripts/pages2/queries/epic_due_date.query.graphql
+          ee/app/assets/javascripts/queries/epic_due_date.query.graphql
+        ]
+      end
+
+      it 'captures the second folder' do
+        expect(subject).to eq(%w[board pages2 query])
+      end
+    end
   end
 
   describe '#system_specs_for_edition' do
     subject do
-      described_class.new(system_specs_base_folder: system_specs_base_folder).system_specs_for_edition(edition)
+      instance.system_specs_for_edition(edition)
+    end
+
+    let(:edition) { nil }
+
+    context 'when a file is not a ruby spec' do
+      before do
+        File.write("#{system_specs_base_folder}/issues_spec.tar.gz", "a test")
+      end
+
+      it 'does not return that file' do
+        expect(subject).to be_empty
+      end
+    end
+
+    context 'when a file is a ruby spec' do
+      let(:spec_pathname) { "#{system_specs_base_folder}/issues_spec.rb" }
+
+      before do
+        File.write(spec_pathname, "a test")
+      end
+
+      it 'returns that file' do
+        expect(subject).to match_array(spec_pathname)
+      end
     end
 
     context 'when FOSS' do