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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
90315114
Commit
90315114
authored
Dec 09, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak specs
parent
28351806
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
...features/merge_requests/merge_when_build_succeeds_spec.rb
+2
-8
No files found.
spec/features/merge_requests/merge_when_build_succeeds_spec.rb
View file @
90315114
...
@@ -43,20 +43,14 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
...
@@ -43,20 +43,14 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context
'When it is enabled'
do
context
'When it is enabled'
do
let
(
:merge_request
)
do
let
(
:merge_request
)
do
create
(
:merge_request_with_diffs
,
source_project:
project
,
author:
user
,
create
(
:merge_request_with_diffs
,
:simple
,
source_project:
project
,
author:
user
,
merge_user:
user
,
title:
"MepMep"
,
merge_when_build_succeeds:
true
)
merge_user:
user
,
title:
"MepMep"
,
merge_when_build_succeeds:
true
)
end
end
let!
(
:ci_commit
)
{
create
(
:ci_commit
,
gl_project:
project
,
sha:
merge_request
.
last_commit
.
id
,
ref:
merge_request
.
source_branch
)
}
let!
(
:ci_commit
)
{
create
(
:ci_commit
,
gl_project:
project
,
sha:
merge_request
.
last_commit
.
id
,
ref:
merge_request
.
source_branch
)
}
let!
(
:ci_build
)
{
create
(
:ci_build
,
commit:
ci_commit
)
}
let!
(
:ci_build
)
{
create
(
:ci_build
,
commit:
ci_commit
)
}
before
do
before
do
merge_request
.
source_project
.
team
<<
[
user
,
:master
]
merge_request
.
source_branch
=
"feature"
merge_request
.
target_branch
=
"master"
merge_request
.
save!
login_as
user
login_as
user
visit_merge_request
(
merge_request
)
visit_merge_request
(
merge_request
)
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