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
8ab045ad
Commit
8ab045ad
authored
Apr 11, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Accept Merge Request -> Accept merge request
parent
aabeb531
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+2
-2
No files found.
features/steps/project/merge_requests.rb
View file @
8ab045ad
...
...
@@ -623,7 +623,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should not see merge button'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
not_to
have_button
(
'Accept
Merge R
equest'
)
expect
(
page
).
not_to
have_button
(
'Accept
merge m
equest'
)
end
end
...
...
@@ -635,7 +635,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see approved merge request "Bug NS-04"'
do
page
.
within
'.mr-state-widget'
do
expect
(
page
).
to
have_button
(
'Accept
Merge R
equest'
,
disabled:
false
)
expect
(
page
).
to
have_button
(
'Accept
merge r
equest'
,
disabled:
false
)
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