summaryrefslogtreecommitdiff
path: root/spec/presenters/merge_request_presenter_spec.rb
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-07-11 14:36:08 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-11 14:36:08 +0000
commita63bce1a4b55bc6cbafb9dec12d33028521489e9 (patch)
treeee9466e6b06536a65d4e851f4096679c6f968d1e /spec/presenters/merge_request_presenter_spec.rb
parent1bf54e092783f7ad388225d32ab79ac1e845559c (diff)
downloadgitlab-ce-a63bce1a4b55bc6cbafb9dec12d33028521489e9.tar.gz
Resolve "Rename the `Master` role to `Maintainer`" Backend
Diffstat (limited to 'spec/presenters/merge_request_presenter_spec.rb')
-rw-r--r--spec/presenters/merge_request_presenter_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/presenters/merge_request_presenter_spec.rb b/spec/presenters/merge_request_presenter_spec.rb
index e3b37739e8e..46ba6f442f5 100644
--- a/spec/presenters/merge_request_presenter_spec.rb
+++ b/spec/presenters/merge_request_presenter_spec.rb
@@ -270,7 +270,7 @@ describe MergeRequestPresenter do
context 'when can create issue and issues enabled' do
it 'returns path' do
allow(project).to receive(:issues_enabled?) { true }
- project.add_master(user)
+ project.add_maintainer(user)
is_expected
.to eq("/#{resource.project.full_path}/issues/new?merge_request_to_resolve_discussions_of=#{resource.iid}")
@@ -288,7 +288,7 @@ describe MergeRequestPresenter do
context 'when issues disabled' do
it 'returns nil' do
allow(project).to receive(:issues_enabled?) { false }
- project.add_master(user)
+ project.add_maintainer(user)
is_expected.to be_nil
end
@@ -307,7 +307,7 @@ describe MergeRequestPresenter do
context 'when merge request enabled and has permission' do
it 'has remove_wip_path' do
allow(project).to receive(:merge_requests_enabled?) { true }
- project.add_master(user)
+ project.add_maintainer(user)
is_expected
.to eq("/#{resource.project.full_path}/merge_requests/#{resource.iid}/remove_wip")