summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-16 11:03:34 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-16 11:03:34 +0000
commit480c01a9749ad1aa4ab033ae9e2270ab597c2cce (patch)
tree3562c2d5f60026f36b2accaf40dc11439b0d4227 /spec
parent644f91552c2db87065796d3848dccc01ad939eb9 (diff)
parentb1cf3225dbb6b897a8be405d599714b74cbfb547 (diff)
downloadgitlab-ce-480c01a9749ad1aa4ab033ae9e2270ab597c2cce.tar.gz
Merge branch '36571-ignore-root-in-repo' into 'master'
Resolve "Error while searching for text starting with slash "/"" Closes #36571 See merge request gitlab-org/gitlab-ce!16455
Diffstat (limited to 'spec')
-rw-r--r--spec/models/repository_spec.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index f3456e5b354..d9395ca61d7 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -668,6 +668,18 @@ describe Repository do
expect(results.first).to eq('files/html/500.html')
end
+ it 'ignores leading slashes' do
+ results = repository.search_files_by_name('/files', 'master')
+
+ expect(results.first).to eq('files/html/500.html')
+ end
+
+ it 'properly handles when query is only slashes' do
+ results = repository.search_files_by_name('//', 'master')
+
+ expect(results).to match_array([])
+ end
+
it 'properly handles when query is not present' do
results = repository.search_files_by_name('', 'master')