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
5c454c62
Commit
5c454c62
authored
Apr 10, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spinach specs
parent
0333e2b8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
features/steps/project/ff_merge_requests.rb
features/steps/project/ff_merge_requests.rb
+3
-3
No files found.
features/steps/project/ff_merge_requests.rb
View file @
5c454c62
...
@@ -18,12 +18,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
...
@@ -18,12 +18,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
end
end
step
'merge request is mergeable'
do
step
'merge request is mergeable'
do
expect
(
page
).
to
have_button
'Accept
Merge R
equest'
expect
(
page
).
to
have_button
'Accept
merge r
equest'
end
end
step
'I should see ff-only merge button'
do
step
'I should see ff-only merge button'
do
expect
(
page
).
to
have_content
"Fast-forward merge without a merge commit"
expect
(
page
).
to
have_content
"Fast-forward merge without a merge commit"
expect
(
page
).
to
have_button
'Accept
Merge R
equest'
expect
(
page
).
to
have_button
'Accept
merge r
equest'
end
end
step
'merge request "Bug NS-05" is mergeable'
do
step
'merge request "Bug NS-05" is mergeable'
do
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
...
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
step
'I accept this merge request'
do
step
'I accept this merge request'
do
page
.
within
'.mr-state-widget'
do
page
.
within
'.mr-state-widget'
do
click_button
"Accept
Merge R
equest"
click_button
"Accept
merge r
equest"
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