Commit d6646e9e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Use the "fix" branch in the MR template spec

parent ee8836a9
......@@ -141,9 +141,9 @@ Feature: Project Merge Requests
And I should still see a comment like "Line is correct" in the first file
Scenario: I submit new unassigned merge request with template description
Given I click link "New Merge Request"
And I select "notes_refactoring" as source
Then I should see description field pre-filled
Given I click link "New Merge Request"
And I select "fix" as source
Then I should see description field pre-filled
@javascript
Scenario: I unfold diff
......
......@@ -242,9 +242,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps
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"
step 'I select "fix" as source' do
select "fix", from: "merge_request_source_branch"
select "feature", from: "merge_request_target_branch"
click_button "Compare branches"
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