summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-07 14:42:42 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-07 14:42:42 +0000
commit1a3edcec4363239a4d080bc9af53d9d455dccfb4 (patch)
tree8bfa139415440f6959c4195213a07ba02f71c722 /spec/models
parent4ccdb83ae489014e671c3fbe75a4d899913c5163 (diff)
parent4c0864fd9e14cda78cacdfbbc2f3072b699ebb9b (diff)
downloadgitlab-ce-1a3edcec4363239a4d080bc9af53d9d455dccfb4.tar.gz
Merge branch 'speed-up-merge-request-all-commits-shas' into 'master'
Speed up `all_commit_shas` for new merge requests See merge request !12706
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index ea405fabff0..1eadc28869f 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -803,7 +803,7 @@ describe MergeRequest, models: true do
shared_examples 'returning all SHA' do
it 'returns all SHA from all merge_request_diffs' do
expect(subject.merge_request_diffs.size).to eq(2)
- expect(subject.all_commit_shas).to eq(all_commit_shas)
+ expect(subject.all_commit_shas).to match_array(all_commit_shas)
end
end