Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d6646e9e
Commit
d6646e9e
authored
Aug 15, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the "fix" branch in the MR template spec
parent
ee8836a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
features/project/merge_requests.feature
features/project/merge_requests.feature
+3
-3
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+3
-3
No files found.
features/project/merge_requests.feature
View file @
d6646e9e
...
...
@@ -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
...
...
features/steps/project/merge_requests.rb
View file @
d6646e9e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment