Commit d6646e9e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Use the "fix" branch in the MR template spec

parent ee8836a9
...@@ -142,7 +142,7 @@ Feature: Project Merge Requests ...@@ -142,7 +142,7 @@ 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 And I select "fix" as source
Then I should see description field pre-filled Then I should see description field pre-filled
@javascript @javascript
......
...@@ -242,9 +242,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps ...@@ -242,9 +242,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end end
end end
step 'I select "notes_refactoring" as source' do step 'I select "fix" as source' do
select "master", from: "merge_request_source_branch" select "fix", from: "merge_request_source_branch"
select "notes_refactoring", from: "merge_request_target_branch" select "feature", from: "merge_request_target_branch"
click_button "Compare branches" click_button "Compare branches"
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