home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7833 from cirosantilli/wiki-cur-url

Browse Source 
Factor current_url + URI.path into current_path.
This commit is contained in:
Robert Schilling
2014-09-23 22:14:17 +02:00
parent 3c9ea7f4a9 b095c1a44e
commit 6da15541d3
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/steps/project/wiki.rb
+4 -8
View File
@@ -11,8 +11,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end
step 'I should be redirected back to the Edit Home Wiki page' do
url = URI.parse(current_url)
url.path.should == project_wiki_path(project, :home)
current_path.should == project_wiki_path(project, :home)
end
step 'I create the Wiki Home page' do
@@ -51,8 +50,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end
step 'I should be redirected back to that Wiki page' do
url = URI.parse(current_url)
url.path.should == project_wiki_path(project, @page)
current_path.should == project_wiki_path(project, @page)
end
step 'That page has two revisions' do
@@ -104,8 +102,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end
step 'I should see the image from wiki repo' do
url = URI.parse(current_url)
url.path.should match("wikis/image.jpg")
current_path.should match('wikis/image.jpg')
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)
@@ -121,8 +118,7 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
end
step 'I should see the new wiki page form' do
url = URI.parse(current_url)
url.path.should match("wikis/image.jpg")
current_path.should match('wikis/image.jpg')
page.should have_content('New Wiki Page')
page.should have_content('Editing - image.jpg')
end