Merge branch '393364-smarter_detection_under_pages_folder' into 'master'

Skip JS "pages" folder when detecting feature tests

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113498



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Alina Mihaila <amihaila@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: ddieulivol <ddieulivol@gitlab.com>

spec/tooling/lib/tooling/mappings/js_to_system_specs_mappings_spec.rb

@@ -129,6 +129,20 @@
     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

tooling/lib/tooling/mappings/js_to_system_specs_mappings.rb

@@ -18,6 +18,7 @@ def initialize(js_base_folder: 'app/assets/javascripts', system_specs_base_folde
         @first_js_folder_extract_regexp = %r{
           (?:.*/)?             # Skips the GitLab edition (e.g. ee/, jh/)
           #{@js_base_folder}/  # Most likely app/assets/javascripts/
+          (?:pages/)?          # If under a pages folder, we capture the following folder
           ([\w-]*)             # Captures the first folder
         }x
       end