1 files changed, 68 insertions, 9 deletions
diff --git a/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb b/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb
index b4576fb7a1d..478b26e97cd 100644
--- a/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb
@@ -84,42 +84,101 @@ RSpec.describe Gitlab::Ci::Config::External::Mapper::Verifier, feature_category:
     end
 
     context 'when files are project files' do
-      let_it_be(:included_project) { create(:project, :repository, namespace: project.namespace, creator: user) }
+      let_it_be(:included_project1) { create(:project, :repository, namespace: project.namespace, creator: user) }
+      let_it_be(:included_project2) { create(:project, :repository, namespace: project.namespace, creator: user) }
 
       let(:files) do
         [
           Gitlab::Ci::Config::External::File::Project.new(
-            { file: 'myfolder/file1.yml', project: included_project.full_path }, context
+            { file: 'myfolder/file1.yml', project: included_project1.full_path }, context
           ),
           Gitlab::Ci::Config::External::File::Project.new(
-            { file: 'myfolder/file2.yml', project: included_project.full_path }, context
+            { file: 'myfolder/file2.yml', project: included_project1.full_path }, context
           ),
           Gitlab::Ci::Config::External::File::Project.new(
-            { file: 'myfolder/file3.yml', project: included_project.full_path }, context
+            { file: 'myfolder/file3.yml', project: included_project1.full_path, ref: 'master' }, context
+          ),
+          Gitlab::Ci::Config::External::File::Project.new(
+            { file: 'myfolder/file1.yml', project: included_project2.full_path }, context
+          ),
+          Gitlab::Ci::Config::External::File::Project.new(
+            { file: 'myfolder/file2.yml', project: included_project2.full_path }, context
           )
         ]
       end
 
       around(:all) do |example|
-        create_and_delete_files(included_project, project_files) do
-          example.run
+        create_and_delete_files(included_project1, project_files) do
+          create_and_delete_files(included_project2, project_files) do
+            example.run
+          end
         end
       end
 
       it 'returns an array of file objects' do
         expect(process.map(&:location)).to contain_exactly(
-          'myfolder/file1.yml', 'myfolder/file2.yml', 'myfolder/file3.yml'
+          'myfolder/file1.yml', 'myfolder/file2.yml', 'myfolder/file3.yml', 'myfolder/file1.yml', 'myfolder/file2.yml'
         )
       end
 
       it 'adds files to the expandset' do
-        expect { process }.to change { context.expandset.count }.by(3)
+        expect { process }.to change { context.expandset.count }.by(5)
       end
 
       it 'calls Gitaly only once for all files', :request_store do
-        # 1 for project.commit.id, 3 for the sha check, 1 for the files
+        files # calling this to load project creations and the `project.commit.id` call
+
+        # 3 for the sha check, 2 for the files in batch
         expect { process }.to change { Gitlab::GitalyClient.get_request_count }.by(5)
       end
+
+      it 'queries with batch', :use_sql_query_cache do
+        files # calling this to load project creations and the `project.commit.id` call
+
+        queries = ActiveRecord::QueryRecorder.new(skip_cached: false) { process }
+        projects_queries = queries.occurrences_starting_with('SELECT "projects"')
+        access_check_queries = queries.occurrences_starting_with('SELECT MAX("project_authorizations"."access_level")')
+
+        expect(projects_queries.values.sum).to eq(1)
+        expect(access_check_queries.values.sum).to eq(2)
+      end
+
+      context 'when the FF ci_batch_project_includes_context is disabled' do
+        before do
+          stub_feature_flags(ci_batch_project_includes_context: false)
+        end
+
+        it 'returns an array of file objects' do
+          expect(process.map(&:location)).to contain_exactly(
+            'myfolder/file1.yml', 'myfolder/file2.yml', 'myfolder/file3.yml',
+            'myfolder/file1.yml', 'myfolder/file2.yml'
+          )
+        end
+
+        it 'adds files to the expandset' do
+          expect { process }.to change { context.expandset.count }.by(5)
+        end
+
+        it 'calls Gitaly for all files', :request_store do
+          files # calling this to load project creations and the `project.commit.id` call
+
+          # 5 for the sha check, 2 for the files in batch
+          expect { process }.to change { Gitlab::GitalyClient.get_request_count }.by(7)
+        end
+
+        it 'queries without batch', :use_sql_query_cache do
+          files # calling this to load project creations and the `project.commit.id` call
+
+          queries = ActiveRecord::QueryRecorder.new(skip_cached: false) { process }
+          projects_queries = queries.occurrences_starting_with('SELECT "projects"')
+          access_check_queries = queries.occurrences_starting_with(
+            'SELECT MAX("project_authorizations"."access_level")'
+          )
+
+          expect(projects_queries.values.sum).to eq(5)
+          expect(access_check_queries.values.sum).to eq(5)
+        end
+      end
     end
 
     context 'when a file includes other files' do