Automatic merge of gitlab-org/gitlab master

db/fixtures/development/17_cycle_analytics.rb

@@ -149,7 +149,7 @@ class Gitlab::Seeder::CycleAnalytics
         email: "vsm-user-#{i}@#{suffix}.com"
       )
 
-      project.group.add_developer(user)
+      project.group&.add_developer(user)
       project.add_developer(user)
 
       @developers << user

qa/qa.rb

@@ -423,6 +423,10 @@ module QA
         autoload :Show, 'qa/page/project/snippet/show'
         autoload :Index, 'qa/page/project/snippet/index'
       end
+
+      module Secure
+        autoload :ConfigurationForm, 'qa/page/project/secure/configuration_form'
+      end
     end
 
     module Profile

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

@@ -5,16 +5,21 @@ module QA
     module Page
       module Project
         module Secure
-          class ConfigurationForm < QA::Page::Base
-            include QA::Page::Component::Select2
-            include QA::Page::Settings::Common
+          module ConfigurationForm
+            extend QA::Page::PageConcern
 
-            view 'ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue' do
-              element :submit_button
-            end
+            def self.prepended(base)
+              super
+
+              base.class_eval do
+                view 'ee/app/assets/javascripts/security_configuration/sast/components/configuration_form.vue' do
+                  element :submit_button
+                end
 
-            view 'ee/app/assets/javascripts/security_configuration/sast/components/analyzer_configuration.vue' do
-              element :entity_checkbox, "`${entity.name}_checkbox`" # rubocop:disable QA/ElementWithPattern
+                view 'ee/app/assets/javascripts/security_configuration/sast/components/analyzer_configuration.vue' do
+                  element :entity_checkbox, "`${entity.name}_checkbox`" # rubocop:disable QA/ElementWithPattern
+                end
+              end
             end
 
             def click_expand_button
@@ -25,10 +30,6 @@ module QA
               click_element(:submit_button)
             end
 
-            def click_sast_enable_button
-              click_element('sast_enable_button')
-            end
-
             def fill_dynamic_field(field_name, content)
               fill_element("#{field_name}_field", content)
             end
@@ -36,12 +37,6 @@ module QA
             def unselect_dynamic_checkbox(checkbox_name)
               uncheck_element("#{checkbox_name}_checkbox", true)
             end
-
-            def has_sast_status?(status_text)
-              within_element('sast_status') do
-                has_text?(status_text)
-              end
-            end
           end
         end
       end

qa/qa/page/project/secure/configuration_form.rb

+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Secure
+        class ConfigurationForm < QA::Page::Base
+          include QA::Page::Component::Select2
+          include QA::Page::Settings::Common
+
+          view 'app/assets/javascripts/security_configuration/components/feature_card.vue' do
+            element :sast_status, "`${feature.type}_status`" # rubocop:disable QA/ElementWithPattern
+            element :sast_enable_button, "`${feature.type}_enable_button`" # rubocop:disable QA/ElementWithPattern
+          end
+
+          def click_sast_enable_button
+            click_element(:sast_enable_button)
+          end
+
+          def has_sast_status?(status_text)
+            within_element(:sast_status) do
+              has_text?(status_text)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+QA::Page::Project::Secure::ConfigurationForm.prepend_mod_with('Page::Project::Secure::ConfigurationForm', namespace: QA)

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

@@ -79,7 +79,7 @@ module QA
         end
         Page::Project::Menu.perform(&:click_on_security_configuration_link)
 
-        EE::Page::Project::Secure::ConfigurationForm.perform do |config_form|
+        Page::Project::Secure::ConfigurationForm.perform do |config_form|
           expect(config_form).to have_sast_status('Not enabled')
 
           config_form.click_sast_enable_button
@@ -131,7 +131,7 @@ module QA
 
         Page::Project::Menu.perform(&:click_on_security_configuration_link)
 
-        EE::Page::Project::Secure::ConfigurationForm.perform do |config_form|
+        Page::Project::Secure::ConfigurationForm.perform do |config_form|
           aggregate_failures "test SAST status is Enabled" do
             expect(config_form).to have_sast_status('Enabled')
             expect(config_form).not_to have_sast_status('Not enabled')