diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-06 16:54:57 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-12-13 17:40:19 +0100 |
| commit | 835a5db376a69dce20ba616d480a5a9ab15b2577 (patch) | |
| tree | 0ecba5bbfa679966cba50e62b0ff19c4d944fc12 /spec/models | |
| parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
| download | gitlab-ce-835a5db376a69dce20ba616d480a5a9ab15b2577.tar.gz | |
Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly
Closes gitaly#808
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/repository_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 358bc3dfb94..89967085f5f 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1007,7 +1007,7 @@ describe Repository do it 'runs without errors' do # old_rev is an ancestor of new_rev - expect(repository.rugged.merge_base(old_rev, new_rev)).to eq(old_rev) + expect(repository.merge_base(old_rev, new_rev)).to eq(old_rev) # old_rev is not a direct ancestor (parent) of new_rev expect(repository.rugged.lookup(new_rev).parent_ids).not_to include(old_rev) @@ -1029,7 +1029,7 @@ describe Repository do it 'raises an exception' do # The 'master' branch is NOT an ancestor of new_rev. - expect(repository.rugged.merge_base(old_rev, new_rev)).not_to eq(old_rev) + expect(repository.merge_base(old_rev, new_rev)).not_to eq(old_rev) # Updating 'master' to new_rev would lose the commits on 'master' that # are not contained in new_rev. This should not be allowed. |