From 786045ab81887e132a902190abb62b9747420c17 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Thu, 16 Oct 2014 00:00:17 -0500 Subject: Fix Rspec error when using non-default port Prevent test failures when GitLab is configured to use a port other than 80. --- spec/helpers/gitlab_markdown_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index 61751a82369..e933b0842af 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -594,7 +594,7 @@ 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 match(%r{src="http://localhost(:\d+)?/assets/emoji/smile.png}) end it "should generate absolute urls for emoji if relative url is present" do -- cgit v1.2.1 From f2764e566e80b3618f5b8508877b9d52021e9f83 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Sat, 18 Oct 2014 00:04:21 -0500 Subject: Use actual GitLab URL for test assertion Assert the full GitLab root URL, including the port, instead of using a regexp to tolerate whatever port is returned. --- spec/helpers/gitlab_markdown_helper_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index e933b0842af..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 match(%r{src="http://localhost(:\d+)?/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 -- cgit v1.2.1