diff options
author | James Lopez <james@jameslopez.es> | 2016-04-12 19:18:56 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-04-12 19:18:56 +0300 |
commit | 91ffd8028977984d3ea9a741a3a655ff6dae76b2 (patch) | |
tree | b8527bdf3aee0b25ed40b12de96cb3206d1883de /spec/support | |
parent | 6f74c7d4827955d44f53eeef0701e4e3c0f718a1 (diff) | |
parent | 2082879d2f3f91b038863f7c67c658d678924564 (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/matchers/markdown_matchers.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/support/matchers/markdown_matchers.rb b/spec/support/matchers/markdown_matchers.rb index 1d52489e804..43cb6ef43f2 100644 --- a/spec/support/matchers/markdown_matchers.rb +++ b/spec/support/matchers/markdown_matchers.rb @@ -13,7 +13,7 @@ module MarkdownMatchers set_default_markdown_messages match do |actual| - link = actual.at_css('a:contains("Relative Link")') + link = actual.at_css('a:contains("Relative Link")') image = actual.at_css('img[alt="Relative Image"]') expect(link['href']).to end_with('master/doc/README.md') @@ -72,14 +72,15 @@ module MarkdownMatchers have_css("img[src$='#{src}']") end + prefix = '/namespace1/gitlabhq/wikis' set_default_markdown_messages match do |actual| - expect(actual).to have_link('linked-resource', href: 'linked-resource') - expect(actual).to have_link('link-text', href: 'linked-resource') + expect(actual).to have_link('linked-resource', href: "#{prefix}/linked-resource") + expect(actual).to have_link('link-text', href: "#{prefix}/linked-resource") expect(actual).to have_link('http://example.com', href: 'http://example.com') expect(actual).to have_link('link-text', href: 'http://example.com/pdfs/gollum.pdf') - expect(actual).to have_image('/gitlabhq/wikis/images/example.jpg') + expect(actual).to have_image("#{prefix}/images/example.jpg") expect(actual).to have_image('http://example.com/images/example.jpg') end end |