Merge branch 'mo-fix-junit-screenshot-feature-flag' into 'master'

Fix JUnit screenshot feature flag

See merge request gitlab-org/gitlab!29260

app/controllers/projects/pipelines_controller.rb

@@ -180,7 +180,7 @@ class Projects::PipelinesController < Projects::ApplicationController
 
           render json: TestReportSerializer
             .new(current_user: @current_user)
-            .represent(test_reports)
+            .represent(test_reports, project: project)
         end
       end
     end

spec/controllers/projects/pipelines_controller_spec.rb

@@ -789,25 +789,49 @@ describe Projects::PipelinesController do
         end
       end
 
-      context 'when test_report contains attachment and scope is with_attachment as a URL param' do
-        let(:pipeline) { create(:ci_pipeline, :with_test_reports_attachment, project: project) }
+      context 'when junit_pipeline_screenshots_view is enabled' do
+        before do
+          stub_feature_flags(junit_pipeline_screenshots_view: { enabled: true, thing: project })
+        end
 
-        it 'returns a test reports with attachment' do
-          get_test_report_json(scope: 'with_attachment')
+        context 'when test_report contains attachment and scope is with_attachment as a URL param' do
+          let(:pipeline) { create(:ci_pipeline, :with_test_reports_attachment, project: project) }
 
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response["test_suites"]).to be_present
+          it 'returns a test reports with attachment' do
+            get_test_report_json(scope: 'with_attachment')
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response["test_suites"]).to be_present
+            expect(json_response["test_suites"].first["test_cases"].first).to include("attachment_url")
+          end
+        end
+
+        context 'when test_report does not contain attachment and scope is with_attachment as a URL param' do
+          let(:pipeline) { create(:ci_pipeline, :with_test_reports, project: project) }
+
+          it 'returns a test reports with empty values' do
+            get_test_report_json(scope: 'with_attachment')
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response["test_suites"]).to be_empty
+          end
         end
       end
 
-      context 'when test_report does not contain attachment and scope is with_attachment as a URL param' do
-        let(:pipeline) { create(:ci_pipeline, :with_test_reports, project: project) }
+      context 'when junit_pipeline_screenshots_view is disabled' do
+        before do
+          stub_feature_flags(junit_pipeline_screenshots_view: { enabled: false, thing: project })
+        end
 
-        it 'returns a test reports with empty values' do
-          get_test_report_json(scope: 'with_attachment')
+        context 'when test_report contains attachment and scope is with_attachment as a URL param' do
+          let(:pipeline) { create(:ci_pipeline, :with_test_reports_attachment, project: project) }
 
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response["test_suites"]).to be_empty
+          it 'returns a test reports without attachment_url' do
+            get_test_report_json(scope: 'with_attachment')
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response["test_suites"].first["test_cases"].first).not_to include("attachment_url")
+          end
         end
       end
     end