Rebase on master

Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb

1 files changed, 9 insertions, 3 deletions

diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index 0ebfe961392..64dde145a89 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
@@ -57,11 +57,17 @@ class ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   And 'I submit new merge request "Wiki Feature"' do
-    fill_in "merge_request_title", :with => "Wiki Feature"
+    #this must come first, so that the target branch is set by the time the "select" for "notes_refactoring" is executed
     select project.path_with_namespace, :from => "merge_request_target_project_id"
+    fill_in "merge_request_title", :with => "Wiki Feature"
     select "master", :from => "merge_request_source_branch"
-    select "stable", :from => "merge_request_target_branch"
-    find(:select, "merge_request_target_branch", {}).find(:option, "stable", {}).value.should == "stable"
+    find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s
+    find(:select, "merge_request_source_project_id", {}).value.should == project.id.to_s
+
+    #using "notes_refactoring" because "Bug NS-04" uses master/stable, this will fail merge_request validation if the branches are the same
+    find(:select, "merge_request_target_branch", {}).find(:option, "notes_refactoring", {}).value.should == "notes_refactoring"
+    select "notes_refactoring", :from => "merge_request_target_branch"
+
     click_button "Submit merge request"
   end