Commit 586aafd7 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'sy-correct-alert-management-ui-perms' into 'master'

Use correct permission and path for enabling Alert Management

See merge request gitlab-org/gitlab!31260
parents 2cfd1805 4903991a
...@@ -4,9 +4,9 @@ module Projects::AlertManagementHelper ...@@ -4,9 +4,9 @@ module Projects::AlertManagementHelper
def alert_management_data(current_user, project) def alert_management_data(current_user, project)
{ {
'project-path' => project.full_path, 'project-path' => project.full_path,
'enable-alert-management-path' => project_settings_operations_path(project), 'enable-alert-management-path' => edit_project_service_path(project, AlertsService),
'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'), 'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
'user-can-enable-alert-management' => 'false', 'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s,
'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s 'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s
} }
end end
......
...@@ -10,34 +10,44 @@ describe Projects::AlertManagementHelper do ...@@ -10,34 +10,44 @@ describe Projects::AlertManagementHelper do
let_it_be(:project_path) { project.full_path } let_it_be(:project_path) { project.full_path }
describe '#alert_management_data' do describe '#alert_management_data' do
let(:user_can_enable_alert_management) { false } let(:user_can_enable_alert_management) { true }
let(:setting_path) { project_settings_operations_path(project) } let(:setting_path) { edit_project_service_path(project, AlertsService) }
before do before do
allow(helper) allow(helper)
.to receive(:can?) .to receive(:can?)
.with(current_user, :admin_operations, project) .with(current_user, :admin_project, project)
.and_return(user_can_enable_alert_management) .and_return(user_can_enable_alert_management)
end end
context 'without alert_managements_setting' do context 'without alert_managements_setting' do
it 'returns index page configuration' do it 'returns index page configuration' do
expect(alert_management_data(current_user, project)).to eq( expect(helper.alert_management_data(current_user, project)).to match(
'project-path' => project_path, 'project-path' => project_path,
'enable-alert-management-path' => setting_path, 'enable-alert-management-path' => setting_path,
'empty-alert-svg-path' => '/images/illustrations/alert-management-empty-state.svg', 'empty-alert-svg-path' => match_asset_path('/assets/illustrations/alert-management-empty-state.svg'),
'user-can-enable-alert-management' => 'false', 'user-can-enable-alert-management' => 'true',
'alert-management-enabled' => 'true' 'alert-management-enabled' => 'true'
) )
end end
end end
context 'when user does not have requisite enablement permissions' do
let(:user_can_enable_alert_management) { false }
it 'shows error tracking enablement as disabled' do
expect(helper.alert_management_data(current_user, project)).to include(
'user-can-enable-alert-management' => 'false'
)
end
end
end end
describe '#alert_management_detail_data' do describe '#alert_management_detail_data' do
let(:alert_id) { 1 } let(:alert_id) { 1 }
it 'returns detail page configuration' do it 'returns detail page configuration' do
expect(alert_management_detail_data(project_path, alert_id)).to eq( expect(helper.alert_management_detail_data(project_path, alert_id)).to eq(
'alert-id' => alert_id, 'alert-id' => alert_id,
'project-path' => project_path 'project-path' => project_path
) )
......
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