Commit daa09250 authored by Jakub Jirutka's avatar Jakub Jirutka

Rename MarkdownHelper to MarkupHelper

parent b61a44fe
...@@ -233,15 +233,15 @@ module ApplicationHelper ...@@ -233,15 +233,15 @@ module ApplicationHelper
end end
def markup?(filename) def markup?(filename)
Gitlab::MarkdownHelper.markup?(filename) Gitlab::MarkupHelper.markup?(filename)
end end
def gitlab_markdown?(filename) def gitlab_markdown?(filename)
Gitlab::MarkdownHelper.gitlab_markdown?(filename) Gitlab::MarkupHelper.gitlab_markdown?(filename)
end end
def asciidoc?(filename) def asciidoc?(filename)
Gitlab::MarkdownHelper.asciidoc?(filename) Gitlab::MarkupHelper.asciidoc?(filename)
end end
# Overrides ActionView::Helpers::UrlHelper#link_to to add `rel="nofollow"` to # Overrides ActionView::Helpers::UrlHelper#link_to to add `rel="nofollow"` to
......
...@@ -55,7 +55,7 @@ module BlobHelper ...@@ -55,7 +55,7 @@ module BlobHelper
end end
def editing_preview_title(filename) def editing_preview_title(filename)
if Gitlab::MarkdownHelper.previewable?(filename) if Gitlab::MarkupHelper.previewable?(filename)
'Preview' 'Preview'
else else
'Preview changes' 'Preview changes'
......
class Tree class Tree
include Gitlab::MarkdownHelper include Gitlab::MarkupHelper
attr_accessor :repository, :sha, :path, :entries attr_accessor :repository, :sha, :path, :entries
......
module Gitlab module Gitlab
module MarkdownHelper module MarkupHelper
module_function module_function
# Public: Determines if a given filename is compatible with GitHub::Markup. # Public: Determines if a given filename is compatible with GitHub::Markup.
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::MarkdownHelper do describe Gitlab::MarkupHelper do
describe '#markup?' do describe '#markup?' do
%w(textile rdoc org creole wiki %w(textile rdoc org creole wiki
mediawiki rst adoc ad asciidoc).each do |type| mediawiki rst adoc ad asciidoc).each do |type|
it "returns true for #{type} files" do it "returns true for #{type} files" do
expect(Gitlab::MarkdownHelper.markup?("README.#{type}")).to be_truthy expect(Gitlab::MarkupHelper.markup?("README.#{type}")).to be_truthy
end end
end end
it 'returns false when given a non-markup filename' do it 'returns false when given a non-markup filename' do
expect(Gitlab::MarkdownHelper.markup?('README.rb')).not_to be_truthy expect(Gitlab::MarkupHelper.markup?('README.rb')).not_to be_truthy
end end
end end
describe '#gitlab_markdown?' do describe '#gitlab_markdown?' do
%w(mdown md markdown).each do |type| %w(mdown md markdown).each do |type|
it "returns true for #{type} files" do it "returns true for #{type} files" do
expect(Gitlab::MarkdownHelper.gitlab_markdown?("README.#{type}")).to be_truthy expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy
end end
end end
it 'returns false when given a non-markdown filename' do it 'returns false when given a non-markdown filename' do
expect(Gitlab::MarkdownHelper.gitlab_markdown?('README.rb')).not_to be_truthy expect(Gitlab::MarkupHelper.gitlab_markdown?('README.rb')).not_to be_truthy
end end
end end
describe '#asciidoc?' do describe '#asciidoc?' do
%w(adoc ad asciidoc ADOC).each do |type| %w(adoc ad asciidoc ADOC).each do |type|
it "returns true for #{type} files" do it "returns true for #{type} files" do
expect(Gitlab::MarkdownHelper.asciidoc?("README.#{type}")).to be_truthy expect(Gitlab::MarkupHelper.asciidoc?("README.#{type}")).to be_truthy
end end
end end
it 'returns false when given a non-asciidoc filename' do it 'returns false when given a non-asciidoc filename' do
expect(Gitlab::MarkdownHelper.asciidoc?('README.rb')).not_to be_truthy expect(Gitlab::MarkupHelper.asciidoc?('README.rb')).not_to be_truthy
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment