diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-09-05 20:25:58 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-09-05 20:25:58 +0000 |
commit | 18b4c66dc6c1c13eb836b6d061a482a4971c93b1 (patch) | |
tree | 4e9cd028942d4c96efc586eb5c2b0364ab3bee62 /spec/services/clusters/applications | |
parent | 1efb4ea8d79d242e002de95963f7aab2ddb651c1 (diff) | |
parent | bc04a1dcf4b71be46ac24ec6a449374d1db2320a (diff) | |
download | gitlab-ce-18b4c66dc6c1c13eb836b6d061a482a4971c93b1.tar.gz |
Merge branch 'group_level_jupyterhub' into 'master'
Group level JupyterHub
See merge request gitlab-org/gitlab-ce!32512
Diffstat (limited to 'spec/services/clusters/applications')
-rw-r--r-- | spec/services/clusters/applications/create_service_spec.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/spec/services/clusters/applications/create_service_spec.rb b/spec/services/clusters/applications/create_service_spec.rb index bb86a742f0e..8dd573c3698 100644 --- a/spec/services/clusters/applications/create_service_spec.rb +++ b/spec/services/clusters/applications/create_service_spec.rb @@ -147,12 +147,12 @@ describe Clusters::Applications::CreateService do using RSpec::Parameterized::TableSyntax - where(:application, :association, :allowed, :pre_create_helm) do - 'helm' | :application_helm | true | false - 'ingress' | :application_ingress | true | true - 'runner' | :application_runner | true | true - 'prometheus' | :application_prometheus | true | true - 'jupyter' | :application_jupyter | false | true + where(:application, :association, :allowed, :pre_create_helm, :pre_create_ingress) do + 'helm' | :application_helm | true | false | false + 'ingress' | :application_ingress | true | true | false + 'runner' | :application_runner | true | true | false + 'prometheus' | :application_prometheus | true | true | false + 'jupyter' | :application_jupyter | true | true | true end with_them do @@ -160,6 +160,7 @@ describe Clusters::Applications::CreateService do klass = "Clusters::Applications::#{application.titleize}" allow_any_instance_of(klass.constantize).to receive(:make_scheduled!).and_call_original create(:clusters_applications_helm, :installed, cluster: cluster) if pre_create_helm + create(:clusters_applications_ingress, :installed, cluster: cluster, external_hostname: 'example.com') if pre_create_ingress end let(:params) { { application: application } } |