diff options
author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-23 21:56:38 +0200 |
---|---|---|
committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-09-23 21:56:38 +0200 |
commit | b095c1a44eda0ea599795859639e50f7c89e448f (patch) | |
tree | 452b12c73b52350248d4bda0acd4be14070b7f4c /features/steps/project/wiki.rb | |
parent | 248990b5e8e169d7c48adb539980a9db6cea4eca (diff) | |
download | gitlab-ce-b095c1a44eda0ea599795859639e50f7c89e448f.tar.gz |
Factor current_url + URI.path into current_path.
Diffstat (limited to 'features/steps/project/wiki.rb')
-rw-r--r-- | features/steps/project/wiki.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/features/steps/project/wiki.rb b/features/steps/project/wiki.rb index 85375818d47..aa00818c602 100644 --- a/features/steps/project/wiki.rb +++ b/features/steps/project/wiki.rb @@ -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 |