diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-03-19 19:18:58 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-03-19 19:18:58 +1100 |
| commit | faf3110228c96b25760cf810afd5bc88405a26d4 (patch) | |
| tree | 5d0d27d9eb4bc3b80a7ede343ae61e55d5743b30 /spec/models/merge_request_spec.rb | |
| parent | e42fbe41528704d8f9dc0493582889c9e691d9e6 (diff) | |
| parent | 6cfea81e6dc51e9627e2b2f64e29834e0e9bfc60 (diff) | |
| download | gitlab-ce-faf3110228c96b25760cf810afd5bc88405a26d4.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted
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 7986aa31e16..4e783acbd8b 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1544,7 +1544,7 @@ describe MergeRequest do end it "executes diff cache service" do - expect_any_instance_of(MergeRequests::MergeRequestDiffCacheService).to receive(:execute).with(subject) + expect_any_instance_of(MergeRequests::MergeRequestDiffCacheService).to receive(:execute).with(subject, an_instance_of(MergeRequestDiff)) subject.reload_diff end |