diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-14 18:58:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-14 18:58:38 +0000 |
| commit | ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e (patch) | |
| tree | 0e6d32bf1368bdc0df58c712bb469bae226af21b /spec/models | |
| parent | d7c1a9d9111f4e545155eab2fbdc89ad4925a52f (diff) | |
| parent | 835a5db376a69dce20ba616d480a5a9ab15b2577 (diff) | |
| download | gitlab-ce-ee9ad1b1f60374e1b83ef6af481ae7ebdd0e7b2e.tar.gz | |
Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly
Closes gitaly#808
See merge request gitlab-org/gitlab-ce!15770
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 f0661b0a972..799d99c0369 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1013,7 +1013,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) @@ -1035,7 +1035,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. |