summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-26 18:27:30 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-29 17:02:02 -0500
commitaed0387f97ec62b184da90bdca0ce40f9dc58b45 (patch)
tree54223237527ddbcaa93bfea552f2fda2b6c1c61f /spec/models/merge_request_spec.rb
parent1ac12698c613774bdace72475573916c142a07e4 (diff)
downloadgitlab-ce-aed0387f97ec62b184da90bdca0ce40f9dc58b45.tar.gz
Consistent diff and blob size limit names
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 712470d6bf5..58f273ade28 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -238,10 +238,10 @@ describe MergeRequest, models: true do
end
context 'when there are no MR diffs' do
- it 'delegates to the compare object, setting no_collapse: true' do
+ it 'delegates to the compare object, setting expanded: true' do
merge_request.compare = double(:compare)
- expect(merge_request.compare).to receive(:diffs).with(options.merge(no_collapse: true))
+ expect(merge_request.compare).to receive(:diffs).with(options.merge(expanded: true))
merge_request.diffs(options)
end