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
e315e3ea
Commit
e315e3ea
authored
Dec 21, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable JavaScript for Approval Spinach specs.
parent
e93f06b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
features/project/merge_requests.feature
features/project/merge_requests.feature
+2
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+0
-1
No files found.
features/project/merge_requests.feature
View file @
e315e3ea
...
...
@@ -329,6 +329,7 @@ Feature: Project Merge Requests
And
I click link
"Close"
Then
I should see closed merge request
"Bug NS-04"
@javascript
Scenario
:
Developer can approve merge request
Given
I am a
"Shop"
developer
And
I visit project
"Shop"
merge requests page
...
...
@@ -337,6 +338,7 @@ Feature: Project Merge Requests
When
I click link
"Approve"
Then
I should see approved merge request
"Bug NS-04"
@javascript
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"
...
...
features/steps/project/merge_requests.rb
View file @
e315e3ea
...
...
@@ -635,7 +635,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see message that MR require an approval from me'
do
page
.
within
'.mr-state-widget'
do
wait_for_ajax
expect
(
page
).
to
have_content
(
"Requires 1 more approval (from
#{
current_user
.
name
}
)"
)
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