diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
| commit | 8b98ca50b3068fecc76233714fa7d363703ee55c (patch) | |
| tree | 97d67331552de76faa9bfb8cec11616a369351fe /spec/models/merge_request_spec.rb | |
| parent | 501d403202d8b4f603dd1864790f56e85633b8ef (diff) | |
| parent | d37f1f1cd013a8b7a307e1004e020df086cba9d5 (diff) | |
| download | gitlab-ce-8b98ca50b3068fecc76233714fa7d363703ee55c.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'spec/models/merge_request_spec.rb')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index b615d956686..90b3a2ba42d 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -441,7 +441,7 @@ describe MergeRequest, models: true do end it "can't be removed when its a protected branch" do - allow(subject.source_project).to receive(:protected_branch?).and_return(true) + allow(ProtectedBranch).to receive(:protected?).and_return(true) expect(subject.can_remove_source_branch?(user)).to be_falsey end |