diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-20 23:19:29 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-05-20 23:19:29 +0300 |
| commit | d951f047198d3ee03604fb64f6ad96efae6cba54 (patch) | |
| tree | 3e6294411a97aafda5d1c6057c5017ccf698f489 /spec | |
| parent | 96725938c082e9f83c476da4dcb5d1e5b1863830 (diff) | |
| parent | c1827f1c502d6235790c7a3841587842c8ad8bc7 (diff) | |
Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'
API: Fix recursive flag not working with Rugged get_tree_entries flag
Closes #61979
See merge request gitlab-org/gitlab-ce!28494
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/git/tree_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/tree_spec.rb b/spec/lib/gitlab/git/tree_spec.rb index 7ad3cde97f8..7e169cfe270 100644 --- a/spec/lib/gitlab/git/tree_spec.rb +++ b/spec/lib/gitlab/git/tree_spec.rb @@ -19,7 +19,9 @@ describe Gitlab::Git::Tree, :seed_helper do it 'returns a list of tree objects' do entries = described_class.where(repository, SeedRepo::Commit::ID, 'files', true) - expect(entries.count).to be >= 5 + expect(entries.map(&:path)).to include('files/html', + 'files/markdown/ruby-style-guide.md') + expect(entries.count).to be >= 10 expect(entries).to all(be_a(Gitlab::Git::Tree)) end |