diff options
author | Stan Hu <stanhu@gmail.com> | 2019-04-20 22:43:59 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-20 23:10:53 -0700 |
commit | 8af9a5bcb5ea0d22f5aeecd8c2d34de3d02558d3 (patch) | |
tree | 1929f542b8fa1041fe8d32e830d3c1c7b3903d37 | |
parent | 61b963efd1126ee80ca6c506f5fd43e2c73f6c8d (diff) | |
download | gitlab-ce-11-5-rugged-stable-backport.tar.gz |
Fix failing spec in spec/models/repository_spec.rb11-5-rugged-stable-backport
-rw-r--r-- | spec/models/repository_spec.rb | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index b138201f2a8..bce80f643a1 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -2251,33 +2251,23 @@ describe Repository do let(:commit) { repository.commit } let(:ancestor) { commit.parents.first } - shared_examples '#ancestor?' do - it 'it is an ancestor' do - expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true) - end - - it 'it is not an ancestor' do - expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false) - end - - it 'returns false on nil-values' do - expect(repository.ancestor?(nil, commit.id)).to eq(false) - expect(repository.ancestor?(ancestor.id, nil)).to eq(false) - expect(repository.ancestor?(nil, nil)).to eq(false) - end + it 'it is an ancestor' do + expect(repository.ancestor?(ancestor.id, commit.id)).to eq(true) + end - it 'returns false for invalid commit IDs' do - expect(repository.ancestor?(commit.id, Gitlab::Git::BLANK_SHA)).to eq(false) - expect(repository.ancestor?( Gitlab::Git::BLANK_SHA, commit.id)).to eq(false) - end + it 'it is not an ancestor' do + expect(repository.ancestor?(commit.id, ancestor.id)).to eq(false) end - context 'with Gitaly enabled' do - it_behaves_like('#ancestor?') + it 'returns false on nil-values' do + expect(repository.ancestor?(nil, commit.id)).to eq(false) + expect(repository.ancestor?(ancestor.id, nil)).to eq(false) + expect(repository.ancestor?(nil, nil)).to eq(false) end - context 'with Gitaly disabled', :skip_gitaly_mock do - it_behaves_like('#ancestor?') + it 'returns false for invalid commit IDs' do + expect(repository.ancestor?(commit.id, Gitlab::Git::BLANK_SHA)).to eq(false) + expect(repository.ancestor?( Gitlab::Git::BLANK_SHA, commit.id)).to eq(false) end end |