Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-05-11 11:52:45 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-05-11 17:01:10 +0300
commit27fb64d6a33ea61ba5a0a3ad50babff8c30fa45f (patch)
treefcec9a2ac082717cba4e662b1a75bc138ffe9364 /spec/models/commit_spec.rb
parentf737a079cee6689e6ba6c1536f223a882a558f3e (diff)
Remove deltas_only from DiffCollection
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r--spec/models/commit_spec.rb21
1 files changed, 4 insertions, 17 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 852889d4540..131fea8be43 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -395,24 +395,11 @@ eos
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:commit_raw_diffs).and_return(true)
end
- context 'when a truthy deltas_only is not passed to args' do
- it 'fetches diffs from Gitaly server' do
- expect(Gitlab::GitalyClient::Commit).to receive(:diff_from_parent).
- with(commit)
+ it 'fetches diffs from Gitaly server' do
+ expect(Gitlab::GitalyClient::Commit).to receive(:diff_from_parent).
+ with(commit)
- commit.raw_diffs
- end
- end
-
- context 'when a truthy deltas_only is passed to args' do
- it 'fetches diffs using Rugged' do
- opts = { deltas_only: true }
-
- expect(Gitlab::GitalyClient::Commit).not_to receive(:diff_from_parent)
- expect(commit.raw).to receive(:diffs).with(opts)
-
- commit.raw_diffs(opts)
- end
+ commit.raw_diffs
end
end
end