Commit 02ae038c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix_test' into 'master'

Fixes failing test
parents e026491d 99e0d0dd
...@@ -46,6 +46,12 @@ Feature: Project Wiki ...@@ -46,6 +46,12 @@ Feature: Project Wiki
And I click on the "Pages" button And I click on the "Pages" button
Then I should see the existing page in the pages list Then I should see the existing page in the pages list
Scenario: File exists in wiki repo
Given I have an existing Wiki page with images linked on page
And I browse to wiki page with images
And I click on existing image link
Then I should see the image from wiki repo
Scenario: Image in wiki repo shown on the page Scenario: Image in wiki repo shown on the page
Given I have an existing Wiki page with images linked on page Given I have an existing Wiki page with images linked on page
And I browse to wiki page with images And I browse to wiki page with images
...@@ -56,9 +62,3 @@ Feature: Project Wiki ...@@ -56,9 +62,3 @@ Feature: Project Wiki
And I browse to wiki page with images And I browse to wiki page with images
And I click on image link And I click on image link
Then I should see the new wiki page form Then I should see the new wiki page form
Scenario: File exists in wiki repo
Given I have an existing Wiki page with images linked on page
And I browse to wiki page with images
And I click on existing image link
Then I should see the image from wiki repo
...@@ -107,6 +107,8 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps ...@@ -107,6 +107,8 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
url = URI.parse(current_url) url = URI.parse(current_url)
url.path.should match("wikis/image.jpg") url.path.should match("wikis/image.jpg")
page.should_not have_xpath('/html') # Page should render the image which means there is no html involved page.should_not have_xpath('/html') # Page should render the image which means there is no html involved
Gollum::Wiki.any_instance.unstub(:file)
Gollum::File.any_instance.unstub(:mime_type)
end end
Then 'Image should be shown on the page' do Then 'Image should be shown on the page' do
......
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