From a194d3125956a854792902797ab5124d659b4caa Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 7 Nov 2017 17:42:58 +0100 Subject: [PATCH 1/2] Fix Projects::Clusters::ApplicationsController failures --- .../projects/clusters/applications_controller_spec.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb index 3213a797756..8b460646059 100644 --- a/spec/controllers/projects/clusters/applications_controller_spec.rb +++ b/spec/controllers/projects/clusters/applications_controller_spec.rb @@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do end describe 'POST create' do - let(:cluster) { create(:cluster, :project, :providing_by_gcp) } + let(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } let(:application) { 'helm' } let(:params) { { application: application, id: cluster.id } } @@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do context 'when application is already installing' do before do - other = current_application.new(cluster: cluster) - other.make_installing! + create(:cluster_applications_helm, :installing, cluster: cluster) end it 'returns 400' do From 1471495e15add514b6b5eaa40d04fb758c466bb4 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Tue, 7 Nov 2017 17:51:30 +0100 Subject: [PATCH 2/2] Review Gitlab::Kubernetes::Namespace --- lib/gitlab/kubernetes/namespace.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/kubernetes/namespace.rb b/lib/gitlab/kubernetes/namespace.rb index 17c6317f32f..c8479fbc0e8 100644 --- a/lib/gitlab/kubernetes/namespace.rb +++ b/lib/gitlab/kubernetes/namespace.rb @@ -4,7 +4,7 @@ module Gitlab attr_accessor :name def initialize(name, client) - self.name = name + @name = name @client = client end