Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Fargher <proglottis@gmail.com>2019-06-18 03:01:56 +0300
committerThong Kuah <tkuah@gitlab.com>2019-06-18 03:01:56 +0300
commit6b9157d5dc9b45cc6d70f10d075bbf149af5f266 (patch)
tree29161152edd2c8cfbf1e4097beced805cdd47a72 /spec/controllers
parent04307096bcc776259d8080bebd688ff6073d07c4 (diff)
Make KubernetesService readonly
We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/branches_controller_spec.rb22
-rw-r--r--spec/controllers/projects/services_controller_spec.rb26
2 files changed, 6 insertions, 42 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index c778b7888dc..cf201c9f735 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -123,7 +123,11 @@ describe Projects::BranchesController do
expect(response).to redirect_to project_tree_path(project, branch)
end
- shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
+ context 'when user configured kubernetes from CI/CD > Clusters' do
+ before do
+ create(:cluster, :provided_by_gcp, projects: [project])
+ end
+
it 'redirects to autodeploy setup page' do
result = { status: :success, branch: double(name: branch) }
@@ -143,22 +147,6 @@ describe Projects::BranchesController do
end
end
- context 'when user configured kubernetes from Integration > Kubernetes' do
- before do
- project.services << build(:kubernetes_service)
- end
-
- it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
- end
-
- context 'when user configured kubernetes from CI/CD > Clusters' do
- before do
- create(:cluster, :provided_by_gcp, projects: [project])
- end
-
- it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
- end
-
it 'redirects to autodeploy setup page' do
result = { status: :success, branch: double(name: branch) }
diff --git a/spec/controllers/projects/services_controller_spec.rb b/spec/controllers/projects/services_controller_spec.rb
index 3608d175d50..5c7f8d95f82 100644
--- a/spec/controllers/projects/services_controller_spec.rb
+++ b/spec/controllers/projects/services_controller_spec.rb
@@ -141,20 +141,6 @@ describe Projects::ServicesController do
end
end
- context 'with a deprecated service' do
- let(:service) { create(:kubernetes_service, project: project) }
-
- before do
- put :update,
- params: { namespace_id: project.namespace, project_id: project, id: service.to_param, service: { namespace: 'updated_namespace' } }
- end
-
- it 'does not update the service' do
- service.reload
- expect(service.namespace).not_to eq('updated_namespace')
- end
- end
-
context 'when activating JIRA service from a template' do
let(:template_service) { create(:jira_service, project: project, template: true) }
@@ -168,20 +154,10 @@ describe Projects::ServicesController do
describe "GET #edit" do
before do
- get :edit, params: { namespace_id: project.namespace, project_id: project, id: service_id }
+ get :edit, params: { namespace_id: project.namespace, project_id: project, id: 'jira' }
end
context 'with approved services' do
- let(:service_id) { 'jira' }
-
- it 'renders edit page' do
- expect(response).to be_success
- end
- end
-
- context 'with a deprecated service' do
- let(:service_id) { 'kubernetes' }
-
it 'renders edit page' do
expect(response).to be_success
end