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
42df7dcd
Commit
42df7dcd
authored
Dec 04, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in spec/controllers/projects/branches_controller_spec.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5c2c9a3f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
15 deletions
+9
-15
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+9
-15
No files found.
spec/controllers/projects/branches_controller_spec.rb
View file @
42df7dcd
...
...
@@ -130,13 +130,6 @@ describe Projects::BranchesController do
expect
(
response
).
to
have_gitlab_http_status
(
302
)
end
end
<<<<<<<
HEAD
context
'when user configured kubernetes from Integration > Kubernetes'
do
before
do
project
.
services
<<
build
(
:kubernetes_service
)
end
=======
context
'when user configured kubernetes from Integration > Kubernetes'
do
before
do
...
...
@@ -158,17 +151,18 @@ describe Projects::BranchesController do
result
=
{
status: :success
,
branch:
double
(
name:
branch
)
}
create
(
:cluster
,
:provided_by_gcp
,
projects:
[
project
])
>>>>>>>
origin
/
master
it_behaves_like
'same behavior between KubernetesService and Platform::Kubernetes'
end
expect_any_instance_of
(
CreateBranchService
).
to
receive
(
:execute
).
and_return
(
result
)
expect
(
SystemNoteService
).
to
receive
(
:new_issue_branch
).
and_return
(
true
)
context
'when user configured kubernetes from CI/CD > Clusters'
do
before
do
create
(
:cluster
,
:provided_by_gcp
,
projects:
[
project
])
end
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
branch_name:
branch
,
issue_iid:
issue
.
iid
it_behaves_like
'same behavior between KubernetesService and Platform::Kubernetes'
expect
(
response
.
location
).
to
include
(
project_new_blob_path
(
project
,
branch
))
expect
(
response
).
to
have_gitlab_http_status
(
302
)
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