Commit 92b36120 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve project_merge_requests.rb feature steps

parent 584117aa
...@@ -21,8 +21,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps ...@@ -21,8 +21,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end end
Then 'I should see merge request "Wiki Feature"' do Then 'I should see merge request "Wiki Feature"' do
within '.merge-request' do
page.should have_content "Wiki Feature" page.should have_content "Wiki Feature"
end end
end
Then 'I should see closed merge request "Bug NS-04"' do Then 'I should see closed merge request "Bug NS-04"' do
merge_request = MergeRequest.find_by_title!("Bug NS-04") merge_request = MergeRequest.find_by_title!("Bug NS-04")
...@@ -56,16 +58,20 @@ class ProjectMergeRequests < Spinach::FeatureSteps ...@@ -56,16 +58,20 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end end
And 'I submit new merge request "Wiki Feature"' do And 'I submit new merge request "Wiki Feature"' do
#this must come first, so that the target branch is set by the time the "select" for "notes_refactoring" is executed fill_in "merge_request_title", with: "Wiki Feature"
select project.path_with_namespace, :from => "merge_request_target_project_id"
fill_in "merge_request_title", :with => "Wiki Feature" # this must come first, so that the target branch is set
select "master", :from => "merge_request_source_branch" # 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"
find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s 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 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 # 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" 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment