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
5e89354f
Commit
5e89354f
authored
May 15, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for test with new form of MR.
parent
0ba4dc11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+1
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+6
-0
No files found.
features/project/merge_requests.feature
View file @
5e89354f
...
...
@@ -142,4 +142,5 @@ Feature: Project Merge Requests
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
features/steps/project/merge_requests.rb
View file @
5e89354f
...
...
@@ -239,6 +239,12 @@ 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"
click_button
"Compare branches"
end
step
'I should see description field pre-filled'
do
find_field
(
'merge_request_description'
).
value
.
should
==
'This merge request should contain the following.'
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