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
Léo-Paul Géneau
gitlab-ce
Commits
305ab040
Commit
305ab040
authored
Oct 22, 2018
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"
This reverts merge request !22407
parent
b887d106
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
87 deletions
+75
-87
spec/services/clusters/create_service_spec.rb
spec/services/clusters/create_service_spec.rb
+16
-87
spec/support/services/clusters/create_service_shared.rb
spec/support/services/clusters/create_service_shared.rb
+59
-0
No files found.
spec/services/clusters/create_service_spec.rb
View file @
305ab040
...
@@ -2,87 +2,17 @@ require 'spec_helper'
...
@@ -2,87 +2,17 @@ require 'spec_helper'
describe
Clusters
::
CreateService
do
describe
Clusters
::
CreateService
do
let
(
:access_token
)
{
'xxx'
}
let
(
:access_token
)
{
'xxx'
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
user
,
params
)
}
describe
'#execute'
do
before
do
allow
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
end
shared_context
'valid cluster create params'
do
let
(
:params
)
do
{
name:
'test-cluster'
,
provider_type: :gcp
,
provider_gcp_attributes:
{
gcp_project_id:
'gcp-project'
,
zone:
'us-central1-a'
,
num_nodes:
1
,
machine_type:
'machine_type-a'
,
legacy_abac:
'true'
}
}
end
end
shared_context
'invalid cluster create params'
do
let
(
:params
)
do
{
name:
'test-cluster'
,
provider_type: :gcp
,
provider_gcp_attributes:
{
gcp_project_id:
'!!!!!!!'
,
zone:
'us-central1-a'
,
num_nodes:
1
,
machine_type:
'machine_type-a'
}
}
end
end
shared_examples
'create cluster service success'
do
it
'creates a cluster object and performs a worker'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
subject
}
.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
1
)
.
and
change
{
Clusters
::
Providers
::
Gcp
.
count
}.
by
(
1
)
expect
(
subject
.
name
).
to
eq
(
'test-cluster'
)
expect
(
subject
.
user
).
to
eq
(
user
)
expect
(
subject
.
provider
.
gcp_project_id
).
to
eq
(
'gcp-project'
)
expect
(
subject
.
provider
.
zone
).
to
eq
(
'us-central1-a'
)
expect
(
subject
.
provider
.
num_nodes
).
to
eq
(
1
)
expect
(
subject
.
provider
.
machine_type
).
to
eq
(
'machine_type-a'
)
expect
(
subject
.
provider
.
access_token
).
to
eq
(
access_token
)
expect
(
subject
.
provider
).
to
be_legacy_abac
expect
(
subject
.
platform
).
to
be_nil
end
end
shared_examples
'create cluster service error'
do
it
'returns an error'
do
expect
(
ClusterProvisionWorker
).
not_to
receive
(
:perform_async
)
expect
{
subject
}.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
0
)
expect
(
subject
.
errors
[
:"provider_gcp.gcp_project_id"
]).
to
be_present
end
end
context
'create cluster for project'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
subject
{
service
.
execute
(
project:
project
,
access_token:
access_token
)
}
subject
{
described_class
.
new
(
user
,
params
)
.
execute
(
project:
project
,
access_token:
access_token
)
}
context
'when provider is gcp'
do
context
'when project has no clusters'
do
context
'when project has no clusters'
do
context
'when correct params'
do
context
'when correct params'
do
include_context
'valid cluster create params'
include_context
'valid cluster create params'
include_examples
'create cluster service success'
include_examples
'create cluster service success'
it
'associates project to the cluster'
do
expect
(
subject
.
project
).
to
eq
(
project
)
end
end
end
context
'when invalid params'
do
context
'when invalid params'
do
...
@@ -102,5 +32,4 @@ describe Clusters::CreateService do
...
@@ -102,5 +32,4 @@ describe Clusters::CreateService do
end
end
end
end
end
end
end
end
end
spec/support/services/clusters/create_service_shared.rb
0 → 100644
View file @
305ab040
shared_context
'valid cluster create params'
do
let
(
:params
)
do
{
name:
'test-cluster'
,
provider_type: :gcp
,
provider_gcp_attributes:
{
gcp_project_id:
'gcp-project'
,
zone:
'us-central1-a'
,
num_nodes:
1
,
machine_type:
'machine_type-a'
,
legacy_abac:
'true'
}
}
end
end
shared_context
'invalid cluster create params'
do
let
(
:params
)
do
{
name:
'test-cluster'
,
provider_type: :gcp
,
provider_gcp_attributes:
{
gcp_project_id:
'!!!!!!!'
,
zone:
'us-central1-a'
,
num_nodes:
1
,
machine_type:
'machine_type-a'
}
}
end
end
shared_examples
'create cluster service success'
do
it
'creates a cluster object and performs a worker'
do
expect
(
ClusterProvisionWorker
).
to
receive
(
:perform_async
)
expect
{
subject
}
.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
1
)
.
and
change
{
Clusters
::
Providers
::
Gcp
.
count
}.
by
(
1
)
expect
(
subject
.
name
).
to
eq
(
'test-cluster'
)
expect
(
subject
.
user
).
to
eq
(
user
)
expect
(
subject
.
project
).
to
eq
(
project
)
expect
(
subject
.
provider
.
gcp_project_id
).
to
eq
(
'gcp-project'
)
expect
(
subject
.
provider
.
zone
).
to
eq
(
'us-central1-a'
)
expect
(
subject
.
provider
.
num_nodes
).
to
eq
(
1
)
expect
(
subject
.
provider
.
machine_type
).
to
eq
(
'machine_type-a'
)
expect
(
subject
.
provider
.
access_token
).
to
eq
(
access_token
)
expect
(
subject
.
provider
).
to
be_legacy_abac
expect
(
subject
.
platform
).
to
be_nil
end
end
shared_examples
'create cluster service error'
do
it
'returns an error'
do
expect
(
ClusterProvisionWorker
).
not_to
receive
(
:perform_async
)
expect
{
subject
}.
to
change
{
Clusters
::
Cluster
.
count
}.
by
(
0
)
expect
(
subject
.
errors
[
:"provider_gcp.gcp_project_id"
]).
to
be_present
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