Upgrade to Rails 4.1.9

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.

1 files changed, 4 insertions, 4 deletions

diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index a5484ad3a00..63ad90e1241 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -23,7 +23,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   step 'I should see merge request "Merge Request On Forked Project"' do
     @project.merge_requests.size.should >= 1
     @merge_request = @project.merge_requests.last
-    current_path.should == project_merge_request_path(@project, @merge_request)
+    current_path.should == namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
     @merge_request.title.should == "Merge Request On Forked Project"
     @merge_request.source_project.should == @forked_project
     @merge_request.source_branch.should == "fix"
@@ -64,7 +64,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I see prefilled new Merge Request page for the forked project' do
-    current_path.should == new_project_merge_request_path(@forked_project)
+    current_path.should == new_namespace_project_merge_request_path(@forked_project.namespace, @forked_project)
     find("#merge_request_source_project_id").value.should == @forked_project.id.to_s
     find("#merge_request_target_project_id").value.should == @project.id.to_s
     find("#merge_request_source_branch").value.should have_content "new_design"
@@ -86,7 +86,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     page.should have_content "An Edited Forked Merge Request"
     @project.merge_requests.size.should >= 1
     @merge_request = @project.merge_requests.last
-    current_path.should == project_merge_request_path(@project, @merge_request)
+    current_path.should == namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
     @merge_request.source_project.should == @forked_project
     @merge_request.source_branch.should == "fix"
     @merge_request.target_branch.should == "master"
@@ -106,7 +106,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I see the edit page prefilled for "Merge Request On Forked Project"' do
-    current_path.should == edit_project_merge_request_path(@project, @merge_request)
+    current_path.should == edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
     page.should have_content "Edit merge request ##{@merge_request.id}"
     find("#merge_request_title").value.should == "Merge Request On Forked Project"
   end