Add e2e tests for empty state of License Compliance and Dependency List

ee/app/assets/javascripts/dependencies/components/app.vue

@@ -122,6 +122,7 @@ export default {
     v-else-if="showEmptyState"
     :title="emptyStateOptions.title"
     :svg-path="emptyStateSvgPath"
+    data-qa-selector="dependency_list_empty_state_description_content"
   >
     <template #description>
       {{ emptyStateOptions.description }}

ee/app/assets/javascripts/license_compliance/components/app.vue

@@ -97,6 +97,7 @@ export default {
     v-else-if="hasEmptyState"
     :title="s__('Licenses|View license details for your project')"
     :svg-path="emptyStateSvgPath"
+    data-qa-selector="license_compliance_empty_state_description_content"
   >
     <template #description>
       {{

qa/qa/ee/page/project/secure/dependency_list.rb

@@ -9,6 +9,11 @@ module QA
             view 'ee/app/assets/javascripts/dependencies/components/dependencies_table.vue' do
               element :dependencies_table_content
             end
+
+            view 'ee/app/assets/javascripts/dependencies/components/app.vue' do
+              element :dependency_list_empty_state_description_content
+            end
+
             def has_dependency_count_of?(expected)
               within_element(:dependencies_table_content) do
                 # expected rows plus header row
@@ -16,6 +21,12 @@ module QA
                 all('tr').count.equal?(expected + header_row)
               end
             end
+
+            def has_empty_state_description?(text)
+              within_element(:dependency_list_empty_state_description_content) do
+                has_text?(text)
+              end
+            end
           end
         end
       end

qa/qa/ee/page/project/secure/license_compliance.rb

@@ -9,6 +9,7 @@ module QA
             include QA::Page::Component::Select2
 
             view 'ee/app/assets/javascripts/license_compliance/components/app.vue' do
+              element :license_compliance_empty_state_description_content
               element :policies_tab
             end
 
@@ -24,6 +25,12 @@ module QA
               element :admin_license_compliance_container
             end
 
+            def has_empty_state_description?(text)
+              within_element(:license_compliance_empty_state_description_content) do
+                has_text?(text)
+              end
+            end
+
             def approve_license(license)
               click_element(:license_add_button)
               expand_select_list

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

@@ -7,16 +7,8 @@ module QA
     let(:approved_license_name) { "MIT License" }
     let(:denied_license_name) { "Apache License 2.0" }
 
-    describe 'License Compliance page' do
-      after(:all) do
-        @runner.remove_via_api!
-      end
-
-      before(:all) do
-        @executor = "qa-runner-#{Time.now.to_i}"
-
-        Flow::Login.sign_in
-
+    context 'License Compliance page' do
+      before(:context) 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'
@@ -24,88 +16,102 @@ module QA
 
         @runner = Resource::Runner.fabricate! do |runner|
           runner.project = @project
-          runner.name = @executor
+          runner.name = "runner-for-#{@project.name}"
           runner.tags = %w[qa test]
         end
+      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.commit_message = 'Create Secure compatible application to serve premade reports'
-        end.project.visit!
-
-        Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
+      after(:context) do
+        @runner&.remove_via_api! if @runner
+        @project&.remove_via_api! if @project
       end
 
       before do
         Flow::Login.sign_in_unless_signed_in
-      end
-
-      it 'can approve a license in the license compliance page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/964' do
         @project.visit!
         Page::Project::Menu.perform(&:click_on_license_compliance)
+      end
 
+      it 'has empty state', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1128' 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_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
 
-      it 'can deny a license in the settings page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/963' do
-        @project.visit!
-        Page::Project::Menu.perform(&:click_on_license_compliance)
+      describe 'approve or deny licenses' do
+        before(:context) do
+          Flow::Login.sign_in_unless_signed_in
 
-        EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
-          license_compliance.open_tab
-          license_compliance.deny_license denied_license_name
+          # 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.commit_message = 'Create Secure compatible application to serve premade reports'
+          end.project.visit!
 
-          expect(license_compliance).to have_denied_license denied_license_name
+          Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
         end
-      end
-    end
 
-    describe 'License Compliance pipeline reports', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241448', type: :bug } do
-      let(:executor) {"qa-runner-#{Time.now.to_i}"}
+        it 'can approve a license in the settings page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/964' do
+          EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
+            license_compliance.open_tab
+            license_compliance.approve_license approved_license_name
 
-      after do
-        @runner.remove_via_api!
-      end
+            expect(license_compliance).to have_approved_license approved_license_name
+          end
+        end
 
-      before do
-        @executor = "qa-runner-#{Time.now.to_i}"
+        it 'can deny a license in the settings page', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/963' do
+          EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
+            license_compliance.open_tab
+            license_compliance.deny_license denied_license_name
 
-        Flow::Login.sign_in
+            expect(license_compliance).to have_denied_license denied_license_name
+          end
+        end
+      end
+    end
 
-        @project = Resource::Project.fabricate_via_api! do |project|
+    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
 
-        @runner = Resource::Runner.fabricate! do |runner|
-          runner.project = @project
-          runner.name = executor
+      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
 
         # Push fixture to generate Secure reports
         Resource::Repository::ProjectPush.fabricate! do |project_push|
-          project_push.project = @project
+          project_push.project = project
           project_push.directory = Pathname
-                                       .new(__dir__)
-                                       .join('../../../../../ee/fixtures/secure_premade_reports')
+            .new(__dir__)
+            .join('../../../../../ee/fixtures/secure_premade_reports')
           project_push.commit_message = 'Create Secure compatible application to serve premade reports'
-        end
+        end.project.visit!
 
-        @project.visit!
         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/-/issues/1767' do
         EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
           license_compliance.open_tab
@@ -113,13 +119,16 @@ module QA
           license_compliance.deny_license denied_license_name
         end
 
-        @project.visit!
+        project.visit!
         Flow::Pipeline.visit_latest_pipeline
 
         Page::Project::Pipeline::Show.perform do |pipeline|
           pipeline.click_on_licenses
-          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

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

@@ -11,37 +11,12 @@ module QA
     let(:dast_scan_example_vuln) { 'Cookie Without SameSite Attribute' }
 
     describe 'Security Reports' do
-      after(:all) do
-        @runner.remove_via_api!
-      end
-
-      before(:all) do
-        @executor = "qa-runner-#{Time.now.to_i}"
-
-        Flow::Login.sign_in
-
-        @project = Resource::Project.fabricate_via_api! do |p|
-          p.name = Runtime::Env.auto_devops_project_name || 'project-with-secure'
-          p.description = 'Project with Secure'
-          p.group = Resource::Group.fabricate_via_api!
-        end
-
-        @runner = Resource::Runner.fabricate! do |runner|
-          runner.project = @project
-          runner.name = @executor
-          runner.tags = %w[qa test]
+      before(:context) do
+        @project = Resource::Project.fabricate_via_api! do |project|
+          project.name = 'project-with-secure'
+          project.description = 'Project with Secure'
+          project.group = Resource::Group.fabricate_via_api!
         end
-
-        # Push fixture to generate Secure reports
-        Resource::Repository::ProjectPush.fabricate! do |push|
-          push.project = @project
-          push.directory = Pathname
-            .new(__dir__)
-            .join('../../../../../ee/fixtures/secure_premade_reports')
-          push.commit_message = 'Create Secure compatible application to serve premade reports'
-        end.project.visit!
-
-        Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
       end
 
       before do
@@ -49,100 +24,139 @@ module QA
         @project.visit!
       end
 
-      it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1777', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325612', type: :bug } do
-        Flow::Pipeline.visit_latest_pipeline
+      after(:context) do
+        @project&.remove_via_api! if @project
+      end
 
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_on_security
+      it 'dependency list has empty state', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1787' do
+        Page::Project::Menu.perform(&:click_on_dependency_list)
 
-          filter_report_and_perform(pipeline, "Dependency Scanning") do
-            expect(pipeline).to have_vulnerability_info_content dependency_scan_example_vuln
-          end
+        EE::Page::Project::Secure::DependencyList.perform do |dependency_list|
+          expect(dependency_list).to have_empty_state_description('The dependency list details information about the components used within your project.')
+          expect(dependency_list).to have_link('More Information', href: %r{\/help\/user\/application_security\/dependency_list\/index})
+        end
+      end
 
-          filter_report_and_perform(pipeline, "Container Scanning") do
-            expect(pipeline).to have_vulnerability_info_content container_scan_example_vuln
-          end
+      context 'populated reports are displayed' do
+        before(:context) do
+          Flow::Login.sign_in_unless_signed_in
 
-          filter_report_and_perform(pipeline, "SAST") do
-            expect(pipeline).to have_vulnerability_info_content sast_scan_example_vuln
+          @runner = Resource::Runner.fabricate_via_api! do |runner|
+            runner.project = @project
+            runner.name = "runner-for-#{@project.name}"
+            runner.tags = %w[qa test]
           end
 
-          filter_report_and_perform(pipeline, "DAST") do
-            expect(pipeline).to have_vulnerability_info_content dast_scan_example_vuln
-          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_premade_reports')
+            project_push.commit_message = 'Create Secure compatible application to serve premade reports'
+          end.project.visit!
+
+          Flow::Pipeline.wait_for_latest_pipeline(pipeline_condition: 'succeeded')
+        end
+
+        after(:context) do
+          @runner&.remove_via_api! if @runner
         end
-      end
 
-      it 'displays security reports in the project security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1683' do
-        Page::Project::Menu.perform(&:click_project)
-        Page::Project::Menu.perform(&:click_on_vulnerability_report)
+        it 'displays security reports in the pipeline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1777', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/325612', type: :bug } do
+          Flow::Pipeline.visit_latest_pipeline
+          Page::Project::Pipeline::Show.perform do |pipeline|
+            pipeline.click_on_security
 
-        EE::Page::Project::Secure::Show.perform do |dashboard|
-          filter_report_and_perform(dashboard, "Dependency Scanning") do
-            expect(dashboard).to have_vulnerability dependency_scan_example_vuln
-          end
+            filter_report_and_perform(pipeline, "Dependency Scanning") do
+              expect(pipeline).to have_vulnerability_info_content dependency_scan_example_vuln
+            end
 
-          filter_report_and_perform(dashboard, "Container Scanning") do
-            expect(dashboard).to have_vulnerability container_scan_example_vuln
-          end
+            filter_report_and_perform(pipeline, "Container Scanning") do
+              expect(pipeline).to have_vulnerability_info_content container_scan_example_vuln
+            end
 
-          filter_report_and_perform(dashboard, "SAST") do
-            expect(dashboard).to have_vulnerability sast_scan_example_vuln
-          end
+            filter_report_and_perform(pipeline, "SAST") do
+              expect(pipeline).to have_vulnerability_info_content sast_scan_example_vuln
+            end
 
-          filter_report_and_perform(dashboard, "DAST") do
-            expect(dashboard).to have_vulnerability dast_scan_example_vuln
+            filter_report_and_perform(pipeline, "DAST") do
+              expect(pipeline).to have_vulnerability_info_content dast_scan_example_vuln
+            end
           end
         end
-      end
 
-      it 'displays security reports in the group security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1280' do
-        Page::Main::Menu.perform(&:go_to_groups)
-        Page::Dashboard::Groups.perform do |groups|
-          groups.click_group @project.group.path
-        end
-        Page::Group::Menu.perform(&:click_group_security_link)
+        it 'displays security reports in the project security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1683' do
+          Page::Project::Menu.perform(&:click_project)
+          Page::Project::Menu.perform(&:click_on_vulnerability_report)
 
-        EE::Page::Group::Secure::Show.perform do |dashboard|
-          expect(dashboard).to have_security_status_project_for_severity('F', @project)
-        end
+          EE::Page::Project::Secure::Show.perform do |dashboard|
+            filter_report_and_perform(dashboard, "Dependency Scanning") do
+              expect(dashboard).to have_vulnerability dependency_scan_example_vuln
+            end
 
-        Page::Group::Menu.perform(&:click_group_vulnerability_link)
+            filter_report_and_perform(dashboard, "Container Scanning") do
+              expect(dashboard).to have_vulnerability container_scan_example_vuln
+            end
 
-        EE::Page::Group::Secure::Show.perform do |dashboard|
-          dashboard.filter_project(@project.name)
+            filter_report_and_perform(dashboard, "SAST") do
+              expect(dashboard).to have_vulnerability sast_scan_example_vuln
+            end
 
-          filter_report_and_perform(dashboard, "Dependency Scanning") do
-            expect(dashboard).to have_vulnerability dependency_scan_example_vuln
+            filter_report_and_perform(dashboard, "DAST") do
+              expect(dashboard).to have_vulnerability dast_scan_example_vuln
+            end
           end
+        end
 
-          filter_report_and_perform(dashboard, "Container Scanning") do
-            expect(dashboard).to have_vulnerability container_scan_example_vuln
+        it 'displays security reports in the group security dashboard', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1280' do
+          Page::Main::Menu.perform(&:go_to_groups)
+          Page::Dashboard::Groups.perform do |groups|
+            groups.click_group @project.group.path
           end
+          Page::Group::Menu.perform(&:click_group_security_link)
 
-          filter_report_and_perform(dashboard, "SAST") do
-            expect(dashboard).to have_vulnerability sast_scan_example_vuln
+          EE::Page::Group::Secure::Show.perform do |dashboard|
+            expect(dashboard).to have_security_status_project_for_severity('F', @project)
           end
 
-          filter_report_and_perform(dashboard, "DAST") do
-            expect(dashboard).to have_vulnerability dast_scan_example_vuln
+          Page::Group::Menu.perform(&:click_group_vulnerability_link)
+
+          EE::Page::Group::Secure::Show.perform do |dashboard|
+            dashboard.filter_project(@project.name)
+
+            filter_report_and_perform(dashboard, "Dependency Scanning") do
+              expect(dashboard).to have_vulnerability dependency_scan_example_vuln
+            end
+
+            filter_report_and_perform(dashboard, "Container Scanning") do
+              expect(dashboard).to have_vulnerability container_scan_example_vuln
+            end
+
+            filter_report_and_perform(dashboard, "SAST") do
+              expect(dashboard).to have_vulnerability sast_scan_example_vuln
+            end
+
+            filter_report_and_perform(dashboard, "DAST") do
+              expect(dashboard).to have_vulnerability dast_scan_example_vuln
+            end
           end
         end
-      end
 
-      it 'displays the Dependency List', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/564', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/328059', type: :bug } do
-        Page::Project::Menu.perform(&:click_on_dependency_list)
+        it 'displays the Dependency List', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/564', quarantine: { only: { pipeline: [:master, :nightly] }, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/328059', type: :bug } do
+          Page::Project::Menu.perform(&:click_on_dependency_list)
 
-        EE::Page::Project::Secure::DependencyList.perform do |dependency_list|
-          expect(dependency_list).to have_dependency_count_of number_of_dependencies_in_fixture
+          EE::Page::Project::Secure::DependencyList.perform do |dependency_list|
+            expect(dependency_list).to have_dependency_count_of number_of_dependencies_in_fixture
+          end
         end
       end
-    end
 
-    def filter_report_and_perform(page, report)
-      page.filter_report_type report
-      yield
-      page.filter_report_type report # Disable filter to avoid combining
+      def filter_report_and_perform(page, report)
+        page.filter_report_type report
+        yield
+        page.filter_report_type report # Disable filter to avoid combining
+      end
     end
   end
 end