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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
c66e5751
Commit
c66e5751
authored
May 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
d49b9939
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
No files found.
features/steps/project/forked_merge_requests.rb
View file @
c66e5751
...
@@ -46,7 +46,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
...
@@ -46,7 +46,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
end
end
step
'I submit the merge request'
do
step
'I submit the merge request'
do
click_button
"Submit merge request"
click_button
"Submit
new
merge request"
end
end
step
'I follow the target commit link'
do
step
'I follow the target commit link'
do
...
...
features/steps/project/merge_requests.rb
View file @
c66e5751
...
@@ -77,7 +77,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -77,7 +77,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
select
"feature"
,
from:
"merge_request_target_branch"
select
"feature"
,
from:
"merge_request_target_branch"
click_button
"Compare branches"
click_button
"Compare branches"
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
fill_in
"merge_request_title"
,
with:
"Wiki Feature"
click_button
"Submit merge request"
click_button
"Submit
new
merge request"
end
end
step
'project "Shop" have "Bug NS-04" open merge request'
do
step
'project "Shop" have "Bug NS-04" open merge request'
do
...
...
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