diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-07-11 17:36:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-07-11 17:36:08 +0300 |
| commit | a63bce1a4b55bc6cbafb9dec12d33028521489e9 (patch) | |
| tree | ee9466e6b06536a65d4e851f4096679c6f968d1e /spec/lib/gitlab/ci/status | |
| parent | 1bf54e092783f7ad388225d32ab79ac1e845559c (diff) | |
Resolve "Rename the `Master` role to `Maintainer`" Backend
Diffstat (limited to 'spec/lib/gitlab/ci/status')
| -rw-r--r-- | spec/lib/gitlab/ci/status/build/play_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/status/stage/common_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/status/build/play_spec.rb b/spec/lib/gitlab/ci/status/build/play_spec.rb index e2bb378f663..02f8c4c114b 100644 --- a/spec/lib/gitlab/ci/status/build/play_spec.rb +++ b/spec/lib/gitlab/ci/status/build/play_spec.rb @@ -46,7 +46,7 @@ describe Gitlab::Ci::Status::Build::Play do context 'when user can not push to the branch' do before do build.project.add_developer(user) - create(:protected_branch, :masters_can_push, + create(:protected_branch, :maintainers_can_push, name: build.ref, project: project) end diff --git a/spec/lib/gitlab/ci/status/stage/common_spec.rb b/spec/lib/gitlab/ci/status/stage/common_spec.rb index 6ec35f8da7e..bb2d0a2c75c 100644 --- a/spec/lib/gitlab/ci/status/stage/common_spec.rb +++ b/spec/lib/gitlab/ci/status/stage/common_spec.rb @@ -27,7 +27,7 @@ describe Gitlab::Ci::Status::Stage::Common do context 'when user has permission to read pipeline' do before do - project.add_master(user) + project.add_maintainer(user) end it 'has details' do |