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
Jérome Perrin
gitlab-ce
Commits
7df45882
Commit
7df45882
authored
May 25, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update specs.
parent
d25026a5
Changes
2
Show 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
+2
-2
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+4
-4
No files found.
features/project/merge_requests.feature
View file @
7df45882
...
@@ -10,8 +10,8 @@ Feature: Project Merge Requests
...
@@ -10,8 +10,8 @@ Feature: Project Merge Requests
Then
I should see
"Bug NS-04"
in merge requests
Then
I should see
"Bug NS-04"
in merge requests
And
I should not see
"Feature NS-03"
in merge requests
And
I should not see
"Feature NS-03"
in merge requests
Scenario
:
I
should see
clos
ed merge requests
Scenario
:
I
should see
reject
ed merge requests
Given
I click link
"
Clos
ed"
Given
I click link
"
Reject
ed"
Then
I should see
"Feature NS-03"
in merge requests
Then
I should see
"Feature NS-03"
in merge requests
And
I should not see
"Bug NS-04"
in merge requests
And
I should not see
"Bug NS-04"
in merge requests
...
...
features/steps/project/merge_requests.rb
View file @
7df45882
...
@@ -19,8 +19,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -19,8 +19,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
click_link
"All"
click_link
"All"
end
end
step
'I click link "
Clos
ed"'
do
step
'I click link "
Reject
ed"'
do
click_link
"
Clos
ed"
click_link
"
Reject
ed"
end
end
step
'I should see merge request "Wiki Feature"'
do
step
'I should see merge request "Wiki Feature"'
do
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see closed merge request "Bug NS-04"'
do
step
'I should see closed merge request "Bug NS-04"'
do
merge_request
=
MergeRequest
.
find_by!
(
title:
"Bug NS-04"
)
merge_request
=
MergeRequest
.
find_by!
(
title:
"Bug NS-04"
)
merge_request
.
closed?
.
should
be_true
merge_request
.
closed?
.
should
be_true
page
.
should
have_content
"
Clos
ed by"
page
.
should
have_content
"
Reject
ed by"
end
end
step
'I should see merge request "Bug NS-04"'
do
step
'I should see merge request "Bug NS-04"'
do
...
@@ -202,7 +202,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -202,7 +202,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see merged request'
do
step
'I should see merged request'
do
within
'.issue-box'
do
within
'.issue-box'
do
page
.
should
have_content
"
Merg
ed"
page
.
should
have_content
"
Accept
ed"
end
end
end
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