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
ff5044d8
Commit
ff5044d8
authored
May 23, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update spinach specs to explicitly check Remove Source Branch.
parent
21fe8f36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
features/project/merge_requests/accept.feature
features/project/merge_requests/accept.feature
+2
-1
features/steps/project/merge_requests/acceptance.rb
features/steps/project/merge_requests/acceptance.rb
+5
-1
No files found.
features/project/merge_requests/accept.feature
View file @
ff5044d8
...
@@ -7,6 +7,7 @@ Feature: Project Merge Requests Acceptance
...
@@ -7,6 +7,7 @@ Feature: Project Merge Requests Acceptance
@javascript
@javascript
Scenario
:
Accepting the Merge Request and removing the source branch
Scenario
:
Accepting the Merge Request and removing the source branch
Given
I am on the Merge Request detail page
Given
I am on the Merge Request detail page
When
I check the
"Remove source branch"
option
And
I click on Accept Merge Request
And
I click on Accept Merge Request
Then
I should see merge request merged
Then
I should see merge request merged
And
I should not see the Remove Source Branch button
And
I should not see the Remove Source Branch button
...
@@ -14,6 +15,7 @@ Feature: Project Merge Requests Acceptance
...
@@ -14,6 +15,7 @@ Feature: Project Merge Requests Acceptance
@javascript
@javascript
Scenario
:
Accepting the Merge Request when URL has an anchor
Scenario
:
Accepting the Merge Request when URL has an anchor
Given
I am on the Merge Request detail with note anchor page
Given
I am on the Merge Request detail with note anchor page
When
I check the
"Remove source branch"
option
And
I click on Accept Merge Request
And
I click on Accept Merge Request
Then
I should see merge request merged
Then
I should see merge request merged
And
I should not see the Remove Source Branch button
And
I should not see the Remove Source Branch button
...
@@ -21,7 +23,6 @@ Feature: Project Merge Requests Acceptance
...
@@ -21,7 +23,6 @@ Feature: Project Merge Requests Acceptance
@javascript
@javascript
Scenario
:
Accepting the Merge Request without removing the source branch
Scenario
:
Accepting the Merge Request without removing the source branch
Given
I am on the Merge Request detail page
Given
I am on the Merge Request detail page
When
I click on
"Remove source branch"
option
When
I click on Accept Merge Request
When
I click on Accept Merge Request
Then
I should see merge request merged
Then
I should see merge request merged
And
I should see the Remove Source Branch button
And
I should see the Remove Source Branch button
features/steps/project/merge_requests/acceptance.rb
View file @
ff5044d8
...
@@ -11,10 +11,14 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
...
@@ -11,10 +11,14 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
visit
merge_request_path
(
@merge_request
,
anchor:
'note_123'
)
visit
merge_request_path
(
@merge_request
,
anchor:
'note_123'
)
end
end
step
'I
click on
"Remove source branch" option'
do
step
'I
uncheck the
"Remove source branch" option'
do
uncheck
(
'Remove source branch'
)
uncheck
(
'Remove source branch'
)
end
end
step
'I check the "Remove source branch" option'
do
check
(
'Remove source branch'
)
end
step
'I click on Accept Merge Request'
do
step
'I click on Accept Merge Request'
do
click_button
(
'Merge'
)
click_button
(
'Merge'
)
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