" do
actual = "Apply _!#{merge_request.iid}_ ASAP"
@@ -308,16 +250,15 @@ describe GitlabMarkdownHelper do
target_html = "some code from $#{snippet.id}\nhere too\n
\n"
- expect(helper.markdown("\n some code from $#{snippet.id}\n here too\n")).
+ expect(markdown("\n some code from $#{snippet.id}\n here too\n")).
to eq(target_html)
- expect(helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n")).
+ expect(markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n")).
to eq(target_html)
end
it "should leave inline code untouched" do
- expect(markdown("\nDon't use `$#{snippet.id}` here.\n")).to eq(
- "Don't use $#{snippet.id} here.
\n"
- )
+ expect(markdown("Don't use `$#{snippet.id}` here.")).
+ to eq "Don't use $#{snippet.id} here.
\n"
end
# REF-LIKE AUTOLINKS? -----------------------------------------------------
@@ -335,89 +276,86 @@ describe GitlabMarkdownHelper do
expect(markdown("screen shot: ")).to eq("screen shot: ![\"some](\"http://example.tld/#!#{merge_request.iid}\")
\n")
end
- it "should generate absolute urls for refs" do
- expect(markdown("##{issue.iid}")).to include(namespace_project_issue_path(project.namespace, project, issue))
- end
-
- # EMOJI -------------------------------------------------------------------
-
- it "should generate absolute urls for emoji" do
- # TODO (rspeicher): Why isn't this with the emoji tests?
- expect(markdown(':smile:')).to(
- include(%(src="#{Gitlab.config.gitlab.url}/assets/emoji/#{Emoji.emoji_filename('smile')}.png))
- )
- end
-
- it "should generate absolute urls for emoji if relative url is present" do
- # TODO (rspeicher): Why isn't this with the emoji tests?
- allow(Gitlab.config.gitlab).to receive(:url).and_return('http://localhost/gitlab/root')
- expect(markdown(":smile:")).to include("src=\"http://localhost/gitlab/root/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
- end
-
- it "should generate absolute urls for emoji if asset_host is present" do
- # TODO (rspeicher): Why isn't this with the emoji tests?
- allow(Gitlab::Application.config).to receive(:asset_host).and_return("https://cdn.example.com")
- ActionView::Base.any_instance.stub_chain(:config, :asset_host).and_return("https://cdn.example.com")
- expect(markdown(":smile:")).to include("src=\"https://cdn.example.com/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
- end
-
# RELATIVE URLS -----------------------------------------------------------
# TODO (rspeicher): These belong in a relative link filter spec
- it "should handle relative urls for a file in master" do
- actual = "[GitLab API doc](doc/api/README.md)\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
+ context 'relative links' do
+ context 'with a valid repository' do
+ before do
+ @repository = project.repository
+ @ref = 'markdown'
+ end
- it "should handle relative urls for a file in master with an anchor" do
- actual = "[GitLab API doc](doc/api/README.md#section)\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle relative urls for a file in master" do
+ actual = "[GitLab API doc](doc/api/README.md)\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should not handle relative urls for the current file with an anchor" do
- actual = "[GitLab API doc](#section)\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle relative urls for a file in master with an anchor" do
+ actual = "[GitLab API doc](doc/api/README.md#section)\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should handle relative urls for a directory in master" do
- actual = "[GitLab API doc](doc/api)\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should not handle relative urls for the current file with an anchor" do
+ actual = "[GitLab API doc](#section)\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should handle absolute urls" do
- actual = "[GitLab](https://www.gitlab.com)\n"
- expected = "GitLab
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle relative urls for a directory in master" do
+ actual = "[GitLab API doc](doc/api)\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should handle relative urls in reference links for a file in master" do
- actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle absolute urls" do
+ actual = "[GitLab](https://www.gitlab.com)\n"
+ expected = "GitLab
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should handle relative urls in reference links for a directory in master" do
- actual = "[GitLab API doc directory][GitLab readmes]\n [GitLab readmes]: doc/api/\n"
- expected = "GitLab API doc directory
\n"
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle relative urls in reference links for a file in master" do
+ actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it "should not handle malformed relative urls in reference links for a file in master" do
- actual = "[GitLab readme]: doc/api/README.md\n"
- expected = ""
- expect(markdown(actual)).to match(expected)
- end
+ it "should handle relative urls in reference links for a directory in master" do
+ actual = "[GitLab API doc directory][GitLab readmes]\n [GitLab readmes]: doc/api/\n"
+ expected = "GitLab API doc directory
\n"
+ expect(markdown(actual)).to match(expected)
+ end
- it 'should allow whitelisted HTML tags from the user' do
- actual = '- Term
- Definition
'
- expect(markdown(actual)).to match(actual)
+ it "should not handle malformed relative urls in reference links for a file in master" do
+ actual = "[GitLab readme]: doc/api/README.md\n"
+ expected = ""
+ expect(markdown(actual)).to match(expected)
+ end
+
+ it 'should allow whitelisted HTML tags from the user' do
+ actual = '- Term
- Definition
'
+ expect(markdown(actual)).to match(actual)
+ end
+ end
+
+ context 'with an empty repository' do
+ before do
+ @project = create(:empty_project)
+ @repository = @project.repository
+ end
+
+ it "should not touch relative urls" do
+ actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
+ expected = "GitLab API doc
\n"
+ expect(markdown(actual)).to match(expected)
+ end
+ end
end
# SANITIZATION ------------------------------------------------------------
+ # TODO (rspeicher): These are testing SanitizationFilter, not `markdown`
it 'should sanitize tags that are not whitelisted' do
actual = ' '
@@ -445,20 +383,6 @@ describe GitlabMarkdownHelper do
end
end
- # TODO (rspeicher): This should be a context of relative link specs, not its own thing
- describe 'markdown for empty repository' do
- before do
- @project = empty_project
- @repository = empty_project.repository
- end
-
- it "should not touch relative urls" do
- actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
- expected = "GitLab API doc
\n"
- expect(markdown(actual)).to match(expected)
- end
- end
-
describe '#render_wiki_content' do
before do
@wiki = double('WikiPage')
diff --git a/spec/lib/gitlab/markdown/emoji_filter_spec.rb b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
new file mode 100644
index 0000000000..18d55c4818
--- /dev/null
+++ b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+ describe EmojiFilter do
+ def filter(html, contexts = {})
+ described_class.call(html, contexts)
+ end
+
+ before do
+ ActionController::Base.asset_host = 'https://foo.com'
+ end
+
+ it 'replaces supported emoji' do
+ doc = filter(':heart:
')
+ expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/2764.png'
+ end
+
+ it 'ignores unsupported emoji' do
+ exp = act = ':foo:
'
+ doc = filter(act)
+ expect(doc.to_html).to match Regexp.escape(exp)
+ end
+
+ it 'correctly encodes the URL' do
+ doc = filter(':+1:
')
+ expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/1F44D.png'
+ end
+
+ it 'matches at the start of a string' do
+ doc = filter(':+1:')
+ expect(doc.css('img').size).to eq 1
+ end
+
+ it 'matches at the end of a string' do
+ doc = filter('This gets a :-1:')
+ expect(doc.css('img').size).to eq 1
+ end
+
+ it 'matches with adjacent text' do
+ doc = filter('+1 (:+1:)')
+ expect(doc.css('img').size).to eq 1
+ end
+
+ it 'matches multiple emoji in a row' do
+ doc = filter(':see_no_evil::hear_no_evil::speak_no_evil:')
+ expect(doc.css('img').size).to eq 3
+ end
+
+ it 'has a title attribute' do
+ doc = filter(':-1:')
+ expect(doc.css('img').first.attr('title')).to eq ':-1:'
+ end
+
+ it 'has an alt attribute' do
+ doc = filter(':-1:')
+ expect(doc.css('img').first.attr('alt')).to eq ':-1:'
+ end
+
+ it 'has an align attribute' do
+ doc = filter(':8ball:')
+ expect(doc.css('img').first.attr('align')).to eq 'absmiddle'
+ end
+
+ it 'has an emoji class' do
+ doc = filter(':cat:')
+ expect(doc.css('img').first.attr('class')).to eq 'emoji'
+ end
+
+ it 'has height and width attributes' do
+ doc = filter(':dog:')
+ img = doc.css('img').first
+
+ expect(img.attr('width')).to eq '20'
+ expect(img.attr('height')).to eq '20'
+ end
+
+ it 'keeps whitespace intact' do
+ doc = filter('This deserves a :+1:, big time.')
+
+ expect(doc.to_html).to match(/^This deserves a , big time\.\z/)
+ end
+
+ it 'uses a custom asset_root context' do
+ root = Gitlab.config.gitlab.url + 'gitlab/root'
+
+ doc = filter(':smile:', asset_root: root)
+ expect(doc.css('img').first.attr('src')).to start_with(root)
+ end
+
+ it 'uses a custom asset_host context' do
+ ActionController::Base.asset_host = 'https://cdn.example.com'
+
+ doc = filter(':frowning:', asset_host: 'https://this-is-ignored-i-guess?')
+ expect(doc.css('img').first.attr('src')).to start_with('https://cdn.example.com')
+ end
+ end
+end