Merge branch 'rs-mr-1050-followup' into 'master'

Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
index 3eaceba5323..30f50b82996 100644
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
@@ -99,15 +99,24 @@ module Gitlab
       # Returns a String
       def path_type(path)
         unescaped_path = Addressable::URI.unescape(path)
-        if repository.tree(current_sha, unescaped_path).entries.any?
+
+        if tree?(unescaped_path)
           'tree'
-        elsif repository.blob_at(current_sha, unescaped_path).try(:image?)
+        elsif image?(unescaped_path)
           'raw'
         else
           'blob'
         end
       end
 
+      def tree?(path)
+        repository.tree(current_sha, path).entries.any?
+      end
+
+      def image?(path)
+        repository.blob_at(current_sha, path).try(:image?)
+      end
+
       def current_sha
         context[:commit].try(:id) ||
           ref ? repository.commit(ref).try(:sha) : repository.head_commit.sha