Fix an issue with edits sending user back to @source_project

-Form was for @source_project rather then @project.
-add spinach test for edit submission on forked project

Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e

2 files changed, 25 insertions, 0 deletions

diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 34e7cb5a29d..245515c33ad 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -37,6 +37,9 @@ Feature: Project Forked Merge Requests
     And I should see merge request "Merge Request On Forked Project"
     And I click link edit "Merge Request On Forked Project"
     Then I see the edit page prefilled for "Merge Request On Forked Project"
+    And I update the merge request title
+    And I save the merge request
+    Then I should see the edited merge request
 
   @javascript
   Scenario: I cannot submit an invalid merge request
diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/project_forked_merge_requests.rb
index 16cb628b41c..d6cad1ba2ec 100644
--- a/features/steps/project/project_forked_merge_requests.rb
+++ b/features/steps/project/project_forked_merge_requests.rb
@@ -100,6 +100,28 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps
     verify_commit_link(".mr_source_commit",@forked_project)
   end
 
+  And 'I update the merge request title' do
+    fill_in "merge_request_title", with: "An Edited Forked Merge Request"
+  end
+
+  And 'I save the merge request' do
+    click_button "Save changes"
+  end
+
+  Then 'I should see the edited merge request' do
+    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)
+    @merge_request.source_project.should == @forked_project
+    @merge_request.source_branch.should == "master"
+    @merge_request.target_branch.should == "stable"
+    page.should have_content @forked_project.path_with_namespace
+    page.should have_content @project.path_with_namespace
+    page.should have_content @merge_request.source_branch
+    page.should have_content @merge_request.target_branch
+  end
+
   Then 'I should see last push widget' do
     page.should have_content "You pushed to new_design"
     page.should have_link "Create Merge Request"