diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-14 14:43:27 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-03-14 14:43:27 +0100 |
| commit | 79709d68c43a77a9f0424419432fb04a6a2c0b23 (patch) | |
| tree | 7bfda278e3c627c61d4a87ab79f4cbc1d14a599b | |
| parent | 6173439bbdb88ce65bacb85523bc8762373363b3 (diff) | |
| download | gitlab-ce-79709d68c43a77a9f0424419432fb04a6a2c0b23.tar.gz | |
One more test
| -rw-r--r-- | spec/models/repository_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 8818972a71c..cf3f88f1bbc 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -858,7 +858,7 @@ describe Repository, models: true 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.is_ancestor?(old_rev, new_rev)).not_to eq(true) # Updating 'master' to new_rev would lose the commits on 'master' that # are not contained in new_rev. This should not be allowed. |