Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b5f39d94f0a3
Commit
b5f39d94
authored
Nov 28, 2017
by
Shinya Maeda
Browse files
Fix feature spec
parent
dd789e270bbb
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
b5f39d94
...
...
@@ -903,7 +903,6 @@
end
# TODO: This will be extended for multiple enviroment clusters
# TODO: Add super nice tests to check this interchangeability
def
deployment_platform
@deployment_platform
||=
clusters
.
find_by
(
enabled:
true
)
&
.
platform_kubernetes
@deployment_platform
||=
services
.
where
(
category: :deployment
).
reorder
(
nil
).
find_by
(
active:
true
)
...
...
spec/features/auto_deploy_spec.rb
View file @
b5f39d94
...
...
@@ -7,7 +7,7 @@
shared_examples
'same behavior between KubernetesService and Platform::Kubernetes'
do
context
'when no deployment service is active'
do
before
do
project
.
kubernetes_service
.
update!
(
active:
false
)
trun_off
end
it
'does not show a button to set up auto deploy'
do
...
...
@@ -18,7 +18,7 @@
context
'when a deployment service is active'
do
before
do
project
.
kubernetes_service
.
update!
(
active:
true
)
trun_on
visit
project_path
(
project
)
end
...
...
@@ -56,6 +56,9 @@
sign_in
user
end
let
(
:trun_on
)
{
project
.
deployment_platform
.
update!
(
active:
true
)
}
let
(
:trun_off
)
{
project
.
deployment_platform
.
update!
(
active:
false
)
}
it_behaves_like
'same behavior between KubernetesService and Platform::Kubernetes'
end
...
...
@@ -66,6 +69,9 @@
sign_in
user
end
let
(
:trun_on
)
{
project
.
deployment_platform
.
cluster
.
update!
(
enabled:
true
)
}
let
(
:trun_off
)
{
project
.
deployment_platform
.
cluster
.
update!
(
enabled:
false
)
}
it_behaves_like
'same behavior between KubernetesService and Platform::Kubernetes'
end
end
spec/features/projects/environments/environments_spec.rb
View file @
b5f39d94
...
...
@@ -233,7 +233,7 @@
end
context
'when user configured kubernetes from CI/CD > Clusters'
do
let
!
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:cluster
)
{
create
(
:cluster
,
:provided_by_gcp
,
projects:
[
create
(
:project
,
:repository
)]
)
}
let
(
:project
)
{
cluster
.
project
}
it_behaves_like
'same behavior between KubernetesService and Platform::Kubernetes'
...
...
Write
Preview
Supports
Markdown
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