Merge branch '346162-enable-feature-flag-by-default' into 'master'

Enable policy type selection page by default

See merge request gitlab-org/gitlab!83600

config/feature_flags/development/container_security_policy_selection.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071
 milestone: '14.10'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true

ee/app/controllers/projects/security/policies_controller.rb

@@ -10,7 +10,7 @@ module Projects
 
       before_action do
         push_frontend_feature_flag(:scan_result_policy, project, default_enabled: :yaml)
-        push_frontend_feature_flag(:container_security_policy_selection, project)
+        push_frontend_feature_flag(:container_security_policy_selection, project, default_enabled: :yaml)
       end
 
       feature_category :security_orchestration

qa/qa/ee/page/project/policies/policy_editor.rb

@@ -6,11 +6,6 @@ module QA
       module Project
         module Policies
           class PolicyEditor < QA::Page::Base
-            view 'ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_editor.vue' do
-              element :policy_type_form_select
-            end
-
-            # Switch to just this when removing the :container_security_policy_selection feature flag
             view 'ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_selection.vue' do
               element :policy_selection_wizard
             end

qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb

@@ -17,10 +17,7 @@ module QA
         project.remove_via_api!
       end
 
-      # TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed
-      context 'without k8s cluster', :requires_admin do
-        let!(:feature_enabled) { Runtime::Feature.enabled?(:container_security_policy_selection)}
-
+      context 'without k8s cluster' do
         before do
           Flow::Login.sign_in
           project.visit!
@@ -43,9 +40,7 @@ module QA
 
           EE::Page::Project::Policies::PolicyEditor.perform do |policy_editor|
             aggregate_failures do
-              # TODO: Remove the selector conditional when the `Runtime::Feature.enable` method call is removed
-              selector = feature_enabled ? :policy_selection_wizard : :policy_type_form_select
-              expect(policy_editor).to have_policy_selection(selector)
+              expect(policy_editor).to have_policy_selection(:policy_selection_wizard)
             end
           end
         end