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
4d93b8cb
Commit
4d93b8cb
authored
Dec 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-add tests for Accept Merge Request button.
parent
0c102894
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+2
-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 @
4d93b8cb
...
...
@@ -335,6 +335,7 @@ Feature: Project Merge Requests
And
I visit project
"Shop"
merge requests page
And
merge request 'Bug NS-04' must be approved
And
I click link
"Bug NS-04"
And
I should see the merge button disabled
When
I click link
"Approve"
Then
I should see approved merge request
"Bug NS-04"
...
...
@@ -342,6 +343,7 @@ Feature: Project Merge Requests
Scenario
:
I
can not approve merge request if I am not an approver
Given
merge request 'Bug NS-04' must be approved by some user
And
I click link
"Bug NS-04"
And
I should see the merge button disabled
When
I should not see Approve button
And
I should see message that MR require an approval
...
...
features/steps/project/merge_requests.rb
View file @
4d93b8cb
...
...
@@ -609,6 +609,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should see the merge button disabled'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_button
(
'Accept Merge Request'
,
disabled:
true
)
end
end
step
'I should not see merge button'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
not_to
have_button
(
'Accept Merge Request'
)
...
...
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