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
b583bb5f
Commit
b583bb5f
authored
Aug 17, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure mr approve tests have satellite
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
680b0877
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
features/project/merge_requests.feature
features/project/merge_requests.feature
+2
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+4
-0
No files found.
features/project/merge_requests.feature
View file @
b583bb5f
...
...
@@ -2,6 +2,7 @@ Feature: Project Merge Requests
Background
:
Given
I sign in as a user
And
I own project
"Shop"
And
project has satellites
And
project
"Shop"
have
"Bug NS-04"
open merge request
And
project
"Shop"
have
"Feature NS-03"
closed merge request
And
I visit project
"Shop"
merge requests page
...
...
features/steps/project/merge_requests.rb
View file @
b583bb5f
...
...
@@ -8,6 +8,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
include
SharedDiffNote
include
SharedUser
step
'project has satellites'
do
project
.
ensure_satellite_exists
end
step
'I click link "New Merge Request"'
do
click_link
"New Merge Request"
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