Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

2 files changed, 16 insertions, 2 deletions

diff --git a/tooling/bin/js_to_system_specs_mappings b/tooling/bin/js_to_system_specs_mappings
new file mode 100755
index 00000000000..3e9d9cb4c5f
--- /dev/null
+++ b/tooling/bin/js_to_system_specs_mappings
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../lib/tooling/mappings/js_to_system_specs_mappings'
+
+changes        = ARGV.shift
+matching_tests = ARGV.shift
+
+changed_files = File.read(changes).split(' ')
+matching_test_files = File.read(matching_tests).split(' ')
+
+system_tests = Tooling::Mappings::JsToSystemSpecsMappings.new.execute(changed_files)
+
+File.write(matching_tests, (matching_test_files + system_tests).join(' '))
diff --git a/tooling/bin/view_to_js_mappings b/tooling/bin/view_to_js_mappings
index 2cebb91892e..483003aac5e 100755
--- a/tooling/bin/view_to_js_mappings
+++ b/tooling/bin/view_to_js_mappings
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../lib/tooling/view_to_js_mappings'
+require_relative '../lib/tooling/mappings/view_to_js_mappings'
 
 changes       = ARGV.shift
 output_file   = ARGV.shift
 changed_files = File.read(changes).split(' ')
 
-File.write(output_file, Tooling::ViewToJsMappings.new.execute(changed_files).join(' '))
+File.write(output_file, Tooling::Mappings::ViewToJsMappings.new.execute(changed_files).join(' '))