Commit 3bb33cda authored by Stan Hu's avatar Stan Hu

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

Enable policy type selection page by default

See merge request gitlab-org/gitlab!83600
parents 9d310f61 d6e74f4f
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071
milestone: '14.10' milestone: '14.10'
type: development type: development
group: group::container security group: group::container security
default_enabled: false default_enabled: true
...@@ -10,7 +10,7 @@ module Projects ...@@ -10,7 +10,7 @@ module Projects
before_action do before_action do
push_frontend_feature_flag(:scan_result_policy, project, default_enabled: :yaml) 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 end
feature_category :security_orchestration feature_category :security_orchestration
......
...@@ -6,11 +6,6 @@ module QA ...@@ -6,11 +6,6 @@ module QA
module Project module Project
module Policies module Policies
class PolicyEditor < QA::Page::Base 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 view 'ee/app/assets/javascripts/threat_monitoring/components/policy_editor/policy_selection.vue' do
element :policy_selection_wizard element :policy_selection_wizard
end end
......
...@@ -17,10 +17,7 @@ module QA ...@@ -17,10 +17,7 @@ module QA
project.remove_via_api! project.remove_via_api!
end end
# TODO: Remove :requires_admin when the `Runtime::Feature.enable` method call is removed context 'without k8s cluster' do
context 'without k8s cluster', :requires_admin do
let!(:feature_enabled) { Runtime::Feature.enabled?(:container_security_policy_selection)}
before do before do
Flow::Login.sign_in Flow::Login.sign_in
project.visit! project.visit!
...@@ -43,9 +40,7 @@ module QA ...@@ -43,9 +40,7 @@ module QA
EE::Page::Project::Policies::PolicyEditor.perform do |policy_editor| EE::Page::Project::Policies::PolicyEditor.perform do |policy_editor|
aggregate_failures do aggregate_failures do
# TODO: Remove the selector conditional when the `Runtime::Feature.enable` method call is removed expect(policy_editor).to have_policy_selection(:policy_selection_wizard)
selector = feature_enabled ? :policy_selection_wizard : :policy_type_form_select
expect(policy_editor).to have_policy_selection(selector)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment