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
dd673660
Commit
dd673660
authored
Mar 14, 2019
by
Tiger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweak kubernetes_service_spec for EE compatibility
parent
d3d24bb4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+5
-2
No files found.
spec/models/project_services/kubernetes_service_spec.rb
View file @
dd673660
...
@@ -360,14 +360,16 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
...
@@ -360,14 +360,16 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
context
'when kubernetes responds with valid pods'
do
context
'when kubernetes responds with valid pods'
do
before
do
before
do
stub_kubeclient_pods
stub_kubeclient_pods
stub_kubeclient_deployments
# Used by EE
end
end
it
{
is_expected
.
to
eq
(
pods:
[
kube_pod
])
}
it
{
is_expected
.
to
include
(
pods:
[
kube_pod
])
}
end
end
context
'when kubernetes responds with 500s'
do
context
'when kubernetes responds with 500s'
do
before
do
before
do
stub_kubeclient_pods
(
status:
500
)
stub_kubeclient_pods
(
status:
500
)
stub_kubeclient_deployments
(
status:
500
)
# Used by EE
end
end
it
{
expect
{
subject
}.
to
raise_error
(
Kubeclient
::
HttpError
)
}
it
{
expect
{
subject
}.
to
raise_error
(
Kubeclient
::
HttpError
)
}
...
@@ -376,9 +378,10 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
...
@@ -376,9 +378,10 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
context
'when kubernetes responds with 404s'
do
context
'when kubernetes responds with 404s'
do
before
do
before
do
stub_kubeclient_pods
(
status:
404
)
stub_kubeclient_pods
(
status:
404
)
stub_kubeclient_deployments
(
status:
404
)
# Used by EE
end
end
it
{
is_expected
.
to
eq
(
pods:
[])
}
it
{
is_expected
.
to
include
(
pods:
[])
}
end
end
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