diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 19:50:02 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 19:50:02 +0300 |
commit | 0a459db00877d032e7765ec9f3b11efcfceaf168 (patch) | |
tree | 72e34b99a2255338d19a929d272961231088f532 | |
parent | 1625adf5bab8faa4291fdce1e75174d7d1faa99d (diff) | |
parent | a194d3125956a854792902797ab5124d659b4caa (diff) |
Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into add-ingress-to-cluster-applications
-rw-r--r-- | spec/controllers/projects/clusters/applications_controller_spec.rb | 5 |
1 files 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 |