summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-22 14:18:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-08-22 14:18:58 +0300
commiteb355dec8768ef128795309c6c9ffa296a6eee22 (patch)
treead0da7e6f51dc770baf26fd6a6e1f515025986f3 /spec/models/merge_request_spec.rb
parent9329436deb3931d28c28b41de56173ef8acd63b5 (diff)
downloadgitlab-ce-eb355dec8768ef128795309c6c9ffa296a6eee22.tar.gz
Restore diff_sha_refs method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 573c8c6c9ce..18d178be49c 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -782,7 +782,7 @@ describe MergeRequest, models: true do
end
end
- describe "#diff_refs" do
+ describe "#diff_sha_refs" do
context "with diffs" do
subject { create(:merge_request, :with_diffs) }
@@ -791,7 +791,7 @@ describe MergeRequest, models: true do
expect_any_instance_of(Repository).not_to receive(:commit)
- subject.diff_refs
+ subject.diff_sha_refs
end
it "returns expected diff_refs" do
@@ -801,7 +801,7 @@ describe MergeRequest, models: true do
head_sha: subject.merge_request_diff.head_commit_sha
)
- expect(subject.diff_refs).to eq(expected_diff_refs)
+ expect(subject.diff_sha_refs).to eq(expected_diff_refs)
end
end
end