summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-10-23 12:11:08 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2014-10-23 12:11:08 +0200
commit744e11c324e361a6665bcbb0314a2fe5fdf5358a (patch)
tree5b1d73143a81c2beef8fde53adb65973736be98c /spec
parente80ef19b310ee4057f6227c4b906d97fbec63683 (diff)
parentf2764e566e80b3618f5b8508877b9d52021e9f83 (diff)
downloadgitlab-ce-744e11c324e361a6665bcbb0314a2fe5fdf5358a.tar.gz
Merge pull request #8053 from mr-vinn/fix-rspec-url
Fix Rspec error when using non-default port
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/gitlab_markdown_helper_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 61751a82369..3c636b747d1 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -594,7 +594,9 @@ describe GitlabMarkdownHelper do
end
it "should generate absolute urls for emoji" do
- markdown(":smile:").should include("src=\"http://localhost/assets/emoji/smile.png")
+ markdown(':smile:').should(
+ include(%(src="#{Gitlab.config.gitlab.url}/assets/emoji/smile.png))
+ )
end
it "should generate absolute urls for emoji if relative url is present" do