Commit 5e89354f authored by Marin Jankovski's avatar Marin Jankovski

Fix for test with new form of MR.

parent 0ba4dc11
...@@ -142,4 +142,5 @@ Feature: Project Merge Requests ...@@ -142,4 +142,5 @@ Feature: Project Merge Requests
Scenario: I submit new unassigned merge request with template description Scenario: I submit new unassigned merge request with template description
Given I click link "New Merge Request" Given I click link "New Merge Request"
And I select "notes_refactoring" as source
Then I should see description field pre-filled Then I should see description field pre-filled
...@@ -239,6 +239,12 @@ class ProjectMergeRequests < Spinach::FeatureSteps ...@@ -239,6 +239,12 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end end
end end
step 'I select "notes_refactoring" as source' do
select "master", from: "merge_request_source_branch"
select "notes_refactoring", from: "merge_request_target_branch"
click_button "Compare branches"
end
step 'I should see description field pre-filled' do step 'I should see description field pre-filled' do
find_field('merge_request_description').value.should == 'This merge request should contain the following.' find_field('merge_request_description').value.should == 'This merge request should contain the following.'
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