Merge branch 'licence_compliance_spec_deq' into 'master'

Dequarantine and fix licence spec pipeline test

See merge request gitlab-org/gitlab!72711

qa/qa/specs/features/ee/browser_ui/secure/license_compliance_spec.rb

@@ -2,130 +2,106 @@
 
 module QA
   RSpec.describe 'Secure', :runner do
-    let(:approved_license_name) { "MIT License" }
-    let(:denied_license_name) { "Apache License 2.0" }
-
-    context 'License Compliance page' do
-      before(:context) do
+    describe 'License Compliance' do
+      before(:all) do
         @project = Resource::Project.fabricate_via_api! do |project|
           project.name = Runtime::Env.auto_devops_project_name || 'project-with-secure'
           project.description = 'Project with Secure'
         end
-
-        @runner = Resource::Runner.fabricate! do |runner|
-          runner.project = @project
-          runner.name = "runner-for-#{@project.name}"
-          runner.tags = ['secure_license']
-        end
       end
 
-      after(:context) do
-        @runner&.remove_via_api! if @runner
+      after(:all) do
         @project&.remove_via_api! if @project
       end
 
-      before do
+      it 'has empty state', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1839' do
         Flow::Login.sign_in_unless_signed_in
         @project.visit!
         Page::Project::Menu.perform(&:click_on_license_compliance)
-      end
 
-      it 'has empty state', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1839' do
         EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
-          expect(license_compliance).to have_empty_state_description('The license list details information about the licenses used within your project.')
-          expect(license_compliance).to have_link('More Information', href: %r{\/help\/user\/compliance\/license_compliance\/index})
+          aggregate_failures do
+            expect(license_compliance).to have_empty_state_description('The license list details information about the licenses used within your project.')
+            expect(license_compliance).to have_link('More Information', href: %r{\/help\/user\/compliance\/license_compliance\/index})
+          end
         end
       end
 
-      describe 'approve or deny licenses' do
-        before(:context) do
-          Flow::Login.sign_in_unless_signed_in
+      context 'License Management' do
+        approved_license_name = 'MIT License'
+        denied_license_name = 'Apache License 2.0'
 
+        before(:context) do
+          @runner = Resource::Runner.fabricate_via_api! do |runner|
+            runner.project = @project
+            runner.name = "runner-for-#{@project.name}"
+            runner.tags = ['secure_license']
+          end
           # Push fixture to generate Secure reports
           Resource::Repository::ProjectPush.fabricate! do |project_push|
             project_push.project = @project
-            project_push.directory = Pathname
-              .new(__dir__)
-              .join('../../../../../ee/fixtures/secure_license_files')
+            project_push.files = [{ name: '.gitlab-ci.yml',
+                                    content: File.read(
+                                      Pathname
+                                       .new(__dir__)
+                                       .join('../../../../../ee/fixtures/secure_license_files/.gitlab-ci.yml')) },
+                                  { name: 'gl-license-scanning-report.json',
+                                    content: File.read(
+                                      Pathname
+                                       .new(__dir__)
+                                       .join('../../../../../ee/fixtures/secure_premade_reports/gl-license-scanning-report.json')) }]
             project_push.commit_message = 'Create Secure compatible application to serve premade reports'
-          end.project.visit!
+          end
 
+          Flow::Login.sign_in_unless_signed_in
+          @project.visit!
           Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
+          @project.visit!
+          Page::Project::Menu.perform(&:click_on_license_compliance)
+          EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
+            license_compliance.open_tab
+            license_compliance.approve_license(approved_license_name)
+            license_compliance.deny_license(denied_license_name)
+          end
+        end
+
+        before do
+          Flow::Login.sign_in_unless_signed_in
+          @project.visit!
+          Page::Project::Menu.perform(&:click_on_license_compliance)
+        end
+
+        after(:context) do
+          @runner&.remove_via_api!
         end
 
         it 'can approve a license in the settings page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1286' do
           EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
             license_compliance.open_tab
-            license_compliance.approve_license approved_license_name
-
-            expect(license_compliance).to have_approved_license approved_license_name
+            expect(license_compliance).to have_approved_license(approved_license_name)
           end
         end
 
         it 'can deny a license in the settings page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1287' do
           EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
             license_compliance.open_tab
-            license_compliance.deny_license denied_license_name
-
-            expect(license_compliance).to have_denied_license denied_license_name
+            expect(license_compliance).to have_denied_license(denied_license_name)
           end
         end
-      end
-    end
-
-    context 'License Compliance pipeline reports', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/284658', type: :bug } do
-      let(:project) do
-        Resource::Project.fabricate_via_api! do |project|
-          project.name = Runtime::Env.auto_devops_project_name || 'project-with-secure'
-          project.description = 'Project with Secure'
-        end
-      end
-
-      let(:runner) do
-        Resource::Runner.fabricate! do |runner|
-          runner.project = project
-          runner.name = "runner-for-#{project.name}"
-          runner.tags = %w[qa test]
-        end
-      end
 
-      before(:context) do
-        Flow::Login.sign_in_unless_signed_in
+        describe 'Pipeline Licence tab', { only: [:staging, :production, :pre] } do
+          it 'can approve and deny licenses in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1285' do
+            @project.visit!
+            Flow::Pipeline.visit_latest_pipeline
 
-        # Push fixture to generate Secure reports
-        Resource::Repository::ProjectPush.fabricate! do |project_push|
-          project_push.project = project
-          project_push.directory = Pathname
-            .new(__dir__)
-            .join('../../../../../ee/fixtures/secure_premade_reports')
-          project_push.commit_message = 'Create Secure compatible application to serve premade reports'
-        end.project.visit!
+            Page::Project::Pipeline::Show.perform do |pipeline|
+              pipeline.click_on_licenses
 
-        Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
-        Page::Project::Menu.perform(&:click_on_license_compliance)
-      end
-
-      after do
-        runner&.remove_via_api! if runner
-        project&.remove_via_api! if project
-      end
-
-      it 'can approve and deny licenses in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1285' do
-        EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
-          license_compliance.open_tab
-          license_compliance.approve_license approved_license_name
-          license_compliance.deny_license denied_license_name
-        end
-
-        project.visit!
-        Flow::Pipeline.visit_latest_pipeline
-
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_on_licenses
-
-          aggregate_failures do
-            expect(pipeline).to have_approved_license approved_license_name
-            expect(pipeline).to have_denied_license denied_license_name
+              aggregate_failures do
+                expect(pipeline).to have_approved_license(approved_license_name)
+                expect(pipeline).to have_denied_license(denied_license_name)
+              end
+            end
           end
         end
       end