Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d6e74f4f
Commit
d6e74f4f
authored
Apr 15, 2022
by
Savas Vedova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the feature flag check
parent
32935f33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
qa/qa/ee/page/project/policies/policy_editor.rb
qa/qa/ee/page/project/policies/policy_editor.rb
+0
-5
qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb
...s/features/ee/browser_ui/10_protect/policies_list_spec.rb
+2
-7
No files found.
qa/qa/ee/page/project/policies/policy_editor.rb
View file @
d6e74f4f
...
...
@@ -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
View file @
d6e74f4f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment