Commit d6e74f4f authored by Savas Vedova's avatar Savas Vedova

Remove the feature flag check

parent 32935f33
...@@ -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