Commit fa1cb1ad authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '321884-rename-tab' into 'master'

Rename scan policies tab to policies

See merge request gitlab-org/gitlab!67421
parents 8722e548 2504979a
- breadcrumb_title _("Scan Policies") - breadcrumb_title _("Policies")
- disable_security_policy_project = !can_update_security_orchestration_policy_project?(project) - disable_security_policy_project = !can_update_security_orchestration_policy_project?(project)
#js-security-policies-list{ data: { assigned_policy_project: assigned_policy_project(project).to_json, #js-security-policies-list{ data: { assigned_policy_project: assigned_policy_project(project).to_json,
......
...@@ -149,7 +149,7 @@ module EE ...@@ -149,7 +149,7 @@ module EE
end end
::Sidebars::MenuItem.new( ::Sidebars::MenuItem.new(
title: _('Scan Policies'), title: _('Policies'),
link: project_security_policy_path(context.project), link: project_security_policy_path(context.project),
active_routes: { controller: ['projects/security/policies'] }, active_routes: { controller: ['projects/security/policies'] },
item_id: :scan_policies item_id: :scan_policies
......
...@@ -193,7 +193,7 @@ RSpec.describe Sidebars::Projects::Menus::SecurityComplianceMenu do ...@@ -193,7 +193,7 @@ RSpec.describe Sidebars::Projects::Menus::SecurityComplianceMenu do
end end
end end
describe 'Scan Policies' do describe 'Policies' do
let(:item_id) { :scan_policies } let(:item_id) { :scan_policies }
context 'when feature flag :security_orchestration_policies_configuration is enabled' do context 'when feature flag :security_orchestration_policies_configuration is enabled' do
...@@ -202,11 +202,11 @@ RSpec.describe Sidebars::Projects::Menus::SecurityComplianceMenu do ...@@ -202,11 +202,11 @@ RSpec.describe Sidebars::Projects::Menus::SecurityComplianceMenu do
stub_licensed_features(security_orchestration_policies: true) stub_licensed_features(security_orchestration_policies: true)
end end
context 'when user can access scan policies' do context 'when user can access policies tab' do
it { is_expected.not_to be_nil } it { is_expected.not_to be_nil }
end end
context 'when user cannot access scan policies' do context 'when user cannot access policies tab' do
let(:user) { nil } let(:user) { nil }
it { is_expected.to be_nil } it { is_expected.to be_nil }
......
...@@ -203,8 +203,8 @@ RSpec.describe 'layouts/nav/sidebar/_project' do ...@@ -203,8 +203,8 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
expect(rendered).to have_link('Threat Monitoring', href: project_threat_monitoring_path(project)) expect(rendered).to have_link('Threat Monitoring', href: project_threat_monitoring_path(project))
end end
it 'scan policies link is visible' do it 'policies link is visible' do
expect(rendered).to have_link('Scan Policies', href: project_security_policy_path(project)) expect(rendered).to have_link('Policies', href: project_security_policy_path(project))
end end
it 'security configuration link is visible' do it 'security configuration link is visible' do
......
...@@ -24873,6 +24873,9 @@ msgstr "" ...@@ -24873,6 +24873,9 @@ msgstr ""
msgid "Point to any links you like: documentation, built binaries, or other related materials. These can be internal or external links from your GitLab instance. Duplicate URLs are not allowed." msgid "Point to any links you like: documentation, built binaries, or other related materials. These can be internal or external links from your GitLab instance. Duplicate URLs are not allowed."
msgstr "" msgstr ""
msgid "Policies"
msgstr ""
msgid "Policy project doesn't exist" msgid "Policy project doesn't exist"
msgstr "" msgstr ""
...@@ -28820,9 +28823,6 @@ msgstr "" ...@@ -28820,9 +28823,6 @@ msgstr ""
msgid "Saving project." msgid "Saving project."
msgstr "" msgstr ""
msgid "Scan Policies"
msgstr ""
msgid "Scanner" msgid "Scanner"
msgstr "" msgstr ""
......
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