kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps

This commit is contained in:
Shinya Maeda 2017-11-08 01:51:52 +09:00
parent c3b79df724 1471495e15
commit 18ac8acb5b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/kubernetes/namespace.rb
View File

@ -4,7 +4,7 @@ module Gitlab
attr_accessor :name
def initialize(name, client)
self.name = name
@name = name
@client = client
end

5
spec/controllers/projects/clusters/applications_controller_spec.rb
View File

@ -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