Commit 18ac8acb authored by Shinya Maeda's avatar Shinya Maeda

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

parents c3b79df7 1471495e
...@@ -4,7 +4,7 @@ module Gitlab ...@@ -4,7 +4,7 @@ module Gitlab
attr_accessor :name attr_accessor :name
def initialize(name, client) def initialize(name, client)
self.name = name @name = name
@client = client @client = client
end end
......
...@@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do ...@@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do
end end
describe 'POST create' do 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(:project) { cluster.project }
let(:application) { 'helm' } let(:application) { 'helm' }
let(:params) { { application: application, id: cluster.id } } let(:params) { { application: application, id: cluster.id } }
...@@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do ...@@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do
context 'when application is already installing' do context 'when application is already installing' do
before do before do
other = current_application.new(cluster: cluster) create(:cluster_applications_helm, :installing, cluster: cluster)
other.make_installing!
end end
it 'returns 400' do it 'returns 400' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment