Commit 2f60a402 authored by Ahmad Sherif's avatar Ahmad Sherif

Remove stubbing from Gitlab::GitalyClient::Commit specs

Closes gitaly#198
parent 34cd1097
...@@ -7,11 +7,6 @@ describe Gitlab::GitalyClient::Commit do ...@@ -7,11 +7,6 @@ describe Gitlab::GitalyClient::Commit do
let(:repository_message) { project.repository.gitaly_repository } let(:repository_message) { project.repository.gitaly_repository }
let(:commit) { project.commit('913c66a37b4a45b9769037c55c2d238bd0942d2e') } let(:commit) { project.commit('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
before do
allow(Gitaly::Diff::Stub).to receive(:new).and_return(diff_stub)
allow(diff_stub).to receive(:commit_diff).and_return([])
end
context 'when a commit has a parent' do context 'when a commit has a parent' do
it 'sends an RPC request with the parent ID as left commit' do it 'sends an RPC request with the parent ID as left commit' do
request = Gitaly::CommitDiffRequest.new( request = Gitaly::CommitDiffRequest.new(
...@@ -20,7 +15,7 @@ describe Gitlab::GitalyClient::Commit do ...@@ -20,7 +15,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id: commit.id, right_commit_id: commit.id,
) )
expect(diff_stub).to receive(:commit_diff).with(request) expect_any_instance_of(Gitaly::Diff::Stub).to receive(:commit_diff).with(request)
described_class.diff_from_parent(commit) described_class.diff_from_parent(commit)
end end
...@@ -35,7 +30,7 @@ describe Gitlab::GitalyClient::Commit do ...@@ -35,7 +30,7 @@ describe Gitlab::GitalyClient::Commit do
right_commit_id: initial_commit.id, right_commit_id: initial_commit.id,
) )
expect(diff_stub).to receive(:commit_diff).with(request) expect_any_instance_of(Gitaly::Diff::Stub).to receive(:commit_diff).with(request)
described_class.diff_from_parent(initial_commit) described_class.diff_from_parent(initial_commit)
end end
...@@ -50,7 +45,7 @@ describe Gitlab::GitalyClient::Commit do ...@@ -50,7 +45,7 @@ describe Gitlab::GitalyClient::Commit do
it 'passes options to Gitlab::Git::DiffCollection' do it 'passes options to Gitlab::Git::DiffCollection' do
options = { max_files: 31, max_lines: 13 } options = { max_files: 31, max_lines: 13 }
expect(Gitlab::Git::DiffCollection).to receive(:new).with([], options) expect(Gitlab::Git::DiffCollection).to receive(:new).with(kind_of(Enumerable), options)
described_class.diff_from_parent(commit, options) described_class.diff_from_parent(commit, options)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment