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
b5b72ed1
Commit
b5b72ed1
authored
May 25, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some tests for jupyter app AR model
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1d6adc27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
3 deletions
+72
-3
app/models/clusters/applications/jupyter.rb
app/models/clusters/applications/jupyter.rb
+10
-2
spec/factories/clusters/applications/helm.rb
spec/factories/clusters/applications/helm.rb
+3
-1
spec/models/clusters/applications/jupyter_spec.rb
spec/models/clusters/applications/jupyter_spec.rb
+59
-0
No files found.
app/models/clusters/applications/jupyter.rb
View file @
b5b72ed1
...
...
@@ -57,10 +57,10 @@ module Clusters
"extraEnv"
=>
{
"GITLAB_HOST"
=>
gitlab_url
},
"cookieSecret"
=>
SecureRandom
.
hex
(
32
)
"cookieSecret"
=>
cookie_secret
},
"proxy"
=>
{
"secretToken"
=>
SecureRandom
.
hex
(
32
)
"secretToken"
=>
secret_token
},
"auth"
=>
{
"gitlab"
=>
{
...
...
@@ -79,6 +79,14 @@ module Clusters
def
content_values
YAML
.
load_file
(
chart_values_file
).
deep_merge!
(
specification
)
end
def
secret_token
@secret_token
||=
SecureRandom
.
hex
(
32
)
end
def
cookie_secret
@cookie_secret
||=
SecureRandom
.
hex
(
32
)
end
end
end
end
spec/factories/clusters/applications/helm.rb
View file @
b5b72ed1
...
...
@@ -35,6 +35,8 @@ FactoryBot.define do
factory
:clusters_applications_ingress
,
class:
Clusters
::
Applications
::
Ingress
factory
:clusters_applications_prometheus
,
class:
Clusters
::
Applications
::
Prometheus
factory
:clusters_applications_runner
,
class:
Clusters
::
Applications
::
Runner
factory
:clusters_applications_jupyter
,
class:
Clusters
::
Applications
::
Jupyter
factory
:clusters_applications_jupyter
,
class:
Clusters
::
Applications
::
Jupyter
do
oauth_application
factory: :oauth_application
end
end
end
spec/models/clusters/applications/jupyter_spec.rb
0 → 100644
View file @
b5b72ed1
require
'rails_helper'
describe
Clusters
::
Applications
::
Jupyter
do
include_examples
'cluster application core specs'
,
:clusters_applications_jupyter
it
{
is_expected
.
to
belong_to
(
:oauth_application
)
}
describe
'#set_initial_status'
do
before
do
jupyter
.
set_initial_status
end
context
'when ingress is not installed'
do
let
(
:cluster
)
{
create
(
:cluster
,
:provided_by_gcp
)
}
let
(
:jupyter
)
{
create
(
:clusters_applications_jupyter
,
cluster:
cluster
)
}
it
{
expect
(
jupyter
.
status_name
).
to
be
(
:not_installable
)
}
end
context
'when ingress is installed and external_ip is assigned'
do
let
(
:ingress
)
{
create
(
:clusters_applications_ingress
,
:installed
,
external_ip:
'127.0.0.1'
)
}
let
(
:jupyter
)
{
create
(
:clusters_applications_jupyter
,
cluster:
ingress
.
cluster
)
}
it
{
expect
(
jupyter
.
status_name
).
to
be
(
:installable
)
}
end
end
describe
'#install_command'
do
let!
(
:ingress
)
{
create
(
:clusters_applications_ingress
,
:installed
,
external_ip:
'127.0.0.1'
)
}
let!
(
:jupyter
)
{
create
(
:clusters_applications_jupyter
,
cluster:
ingress
.
cluster
)
}
subject
{
jupyter
.
install_command
}
it
{
is_expected
.
to
be_an_instance_of
(
Gitlab
::
Kubernetes
::
Helm
::
InstallCommand
)
}
it
'should be initialized with 4 arguments'
do
expect
(
subject
.
name
).
to
eq
(
'jupyter'
)
expect
(
subject
.
chart
).
to
eq
(
'jupyter/jupyterhub'
)
expect
(
subject
.
repository
).
to
eq
(
'https://jupyterhub.github.io/helm-chart/'
)
expect
(
subject
.
values
).
to
eq
(
jupyter
.
values
)
end
end
describe
'#values'
do
let
(
:jupyter
)
{
create
(
:clusters_applications_jupyter
)
}
subject
{
jupyter
.
values
}
it
'should include valid values'
do
is_expected
.
to
include
(
'ingress'
)
is_expected
.
to
include
(
'hub'
)
is_expected
.
to
include
(
'rbac'
)
is_expected
.
to
include
(
'proxy'
)
is_expected
.
to
include
(
'auth'
)
is_expected
.
to
include
(
"clientId:
#{
jupyter
.
oauth_application
.
uid
}
"
)
is_expected
.
to
include
(
"callbackUrl:
#{
jupyter
.
callback_url
}
"
)
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