Move Regexp.escape(), fix formatting on tests.

b1cf3225 · Andrew McCallum · a539e03d · b1cf3225 · b1cf3225
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -938,11 +938,11 @@ def search_files_by_content(query, ref)
  end

  def search_files_by_name(query, ref)
-    safe_query = query.sub(/^\/*/, "")
+    safe_query = Regexp.escape(query.sub(/^\/*/, ""))

    return [] if empty? || safe_query.blank?

-    args = %W(ls-tree --full-tree -r #{ref || root_ref} --name-status | #{Regexp.escape(safe_query)})
+    args = %W(ls-tree --full-tree -r #{ref || root_ref} --name-status | #{safe_query})

    run_git(args).first.lines.map(&:strip)
  end

--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -675,9 +675,9 @@ def expect_to_raise_storage_error
    end

    it 'properly handles when query is only slashes' do
-       results = repository.search_files_by_name('//', 'master')
+      results = repository.search_files_by_name('//', 'master')

-       expect(results).to match_array([])
+      expect(results).to match_array([])
    end

    it 'properly handles when query is not present' do