Commit e3c86565 authored by Igor Drozdov's avatar Igor Drozdov

Merge branch 'user-helpers-spec' into 'master'

Fix duplicate spec in user helper specs

See merge request gitlab-org/gitlab!28854
parents d5cb4762 41cb54cb
...@@ -388,5 +388,4 @@ RSpec/RepeatedExample: ...@@ -388,5 +388,4 @@ RSpec/RepeatedExample:
Exclude: Exclude:
- 'spec/features/merge_request/user_posts_diff_notes_spec.rb' - 'spec/features/merge_request/user_posts_diff_notes_spec.rb'
- 'spec/features/projects/files/template_type_dropdown_spec.rb' - 'spec/features/projects/files/template_type_dropdown_spec.rb'
- 'spec/helpers/users_helper_spec.rb'
- 'spec/services/notification_service_spec.rb' - 'spec/services/notification_service_spec.rb'
---
title: Fix duplicate spec from user helper spec
merge_request: 28854
author: Rajendra Kadam
type: added
...@@ -95,9 +95,9 @@ describe UsersHelper do ...@@ -95,9 +95,9 @@ describe UsersHelper do
end end
it 'includes the settings tab if the user can update themself' do it 'includes the settings tab if the user can update themself' do
expect(helper).to receive(:can?).with(user, :read_user, user) { true } expect(helper).to receive(:can?).with(user, :update_user, user) { true }
expect(items).to include(:profile) expect(items).to include(:settings)
end end
context 'when terms are enforced' do context 'when terms are enforced' do
......
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