| ... | @@ -60,20 +60,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps |
... | @@ -60,20 +60,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps |
|
|
|
|
|
|
|
step 'I submit new merge request "Wiki Feature"' do
|
|
step 'I submit new merge request "Wiki Feature"' do
|
|
|
fill_in "merge_request_title", with: "Wiki Feature"
|
|
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"
|
|
|
|
|
select "master", from: "merge_request_source_branch"
|
|
select "master", from: "merge_request_source_branch"
|
|
|
|
|
|
|
|
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"
|
|
select "notes_refactoring", from: "merge_request_target_branch"
|
|
|
|
|
|
|
|
click_button "Submit merge request"
|
|
click_button "Submit merge request"
|
|
|
end
|
|
end
|
|
|
|
|
|
| ... | |
... | |
| ... | | ... | |