diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-08 11:39:50 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-03-08 11:39:50 -0300 |
commit | 5174e99aa288c1bea2b2f65104aa37f7f1fc794e (patch) | |
tree | 6b3d7051b73eee25289c578f101519e49c93610a /spec/models/compare_spec.rb | |
parent | c6273ec50c019a115b11a8ef1032a64710f0a46a (diff) | |
download | gitlab-ce-5174e99aa288c1bea2b2f65104aa37f7f1fc794e.tar.gz |
Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loading
Diffstat (limited to 'spec/models/compare_spec.rb')
-rw-r--r-- | spec/models/compare_spec.rb | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/spec/models/compare_spec.rb b/spec/models/compare_spec.rb index 4200af0e0f5..8e88bb81162 100644 --- a/spec/models/compare_spec.rb +++ b/spec/models/compare_spec.rb @@ -37,28 +37,6 @@ describe Compare do end end - describe '#base_commit' do - let(:base_commit) { Commit.new(another_sample_commit, project) } - - it 'returns project merge base commit' do - expect(project).to receive(:merge_base_commit).with(start_commit.id, head_commit.id).and_return(base_commit) - - expect(subject.base_commit).to eq(base_commit) - end - - it 'returns nil if there is no start_commit' do - expect(subject).to receive(:start_commit).and_return(nil) - - expect(subject.base_commit).to eq(nil) - end - - it 'returns nil if there is no head commit' do - expect(subject).to receive(:head_commit).and_return(nil) - - expect(subject.base_commit).to eq(nil) - end - end - describe '#base_commit_sha' do it 'returns @base_sha if it is present' do expect(project).not_to receive(:merge_base_commit) @@ -87,13 +65,23 @@ describe Compare do 3.times { subject.base_commit_sha } end + + it 'returns nil if there is no start_commit' do + expect(subject).to receive(:start_commit).and_return(nil) + + expect(subject.base_commit_sha).to eq(nil) + end + + it 'returns nil if there is no head commit' do + expect(subject).to receive(:head_commit).and_return(nil) + + expect(subject.base_commit_sha).to eq(nil) + end end describe '#diff_refs' do - it 'uses base_commit sha as base_sha' do - expect(subject).to receive(:base_commit).at_least(:once).and_call_original - - expect(subject.diff_refs.base_sha).to eq(subject.base_commit.id) + it 'uses base_commit_sha sha as base_sha' do + expect(subject.diff_refs.base_sha).to eq(subject.base_commit_sha) end it 'uses start_commit sha as start_sha' do |