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
54d4e981
Commit
54d4e981
authored
Jun 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add tests for rebase mr checkbox
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
19bd91b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
features/project/merge_requests.feature
features/project/merge_requests.feature
+8
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+10
-0
No files found.
features/project/merge_requests.feature
View file @
54d4e981
...
...
@@ -227,3 +227,11 @@ Feature: Project Merge Requests
And
I should not see merge button
When
I click link
"Approve"
Then
I should see approved merge request
"Bug NS-04"
Scenario
:
I
should see rebase checkbox
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
rebase before merge enabled
And
merge request
"Bug NS-05"
is mergeable
And
I visit merge request page
"Bug NS-05"
And
merge request is mergeable
Then
I should see rebase checkbox
features/steps/project/merge_requests.rb
View file @
54d4e981
...
...
@@ -356,6 +356,16 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'rebase before merge enabled'
do
project
=
merge_request
.
target_project
project
.
merge_requests_rebase_enabled
=
true
project
.
save!
end
step
'I should see rebase checkbox'
do
expect
(
page
).
to
have_content
'Rebase before merge'
end
def
merge_request
@merge_request
||=
MergeRequest
.
find_by!
(
title:
"Bug NS-05"
)
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