1 files changed, 98 insertions, 25 deletions
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
index 45b8ce94815..19446ce1cf8 100644
--- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Clusters::Applications::CheckInstallationProgressService do
+describe Clusters::Applications::CheckInstallationProgressService, '#execute' do
   RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
 
   let(:application) { create(:clusters_applications_helm, :installing) }
@@ -21,24 +21,39 @@ describe Clusters::Applications::CheckInstallationProgressService do
           expect(ClusterWaitForAppInstallationWorker).to receive(:perform_in).once
           expect(service).not_to receive(:remove_installation_pod)
 
-          service.execute
+          expect do
+            service.execute
+
+            application.reload
+          end.not_to change(application, :status)
 
-          expect(application).to be_installing
           expect(application.status_reason).to be_nil
         end
       end
+    end
+  end
 
-      context 'when timeouted' do
-        let(:application) { create(:clusters_applications_helm, :timeouted) }
+  shared_examples 'error logging' do
+    context 'when installation raises a Kubeclient::HttpError' do
+      let(:cluster) { create(:cluster, :provided_by_user, :project) }
 
-        it 'make the application errored' do
-          expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
+      before do
+        application.update!(cluster: cluster)
 
-          service.execute
+        expect(service).to receive(:installation_phase).and_raise(Kubeclient::HttpError.new(401, 'Unauthorized', nil))
+      end
 
-          expect(application).to be_errored
-          expect(application.status_reason).to eq("Installation timed out. Check pod logs for install-helm for more details.")
-        end
+      it 'shows the response code from the error' do
+        service.execute
+
+        expect(application).to be_errored.or(be_update_errored)
+        expect(application.status_reason).to eq('Kubernetes error: 401')
+      end
+
+      it 'should log error' do
+        expect(service.send(:logger)).to receive(:error)
+
+        service.execute
       end
     end
   end
@@ -48,10 +63,15 @@ describe Clusters::Applications::CheckInstallationProgressService do
     allow(service).to receive(:remove_installation_pod).and_return(nil)
   end
 
-  describe '#execute' do
+  context 'when application is updating' do
+    let(:application) { create(:clusters_applications_helm, :updating) }
+
+    include_examples 'error logging'
+
+    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
+
     context 'when installation POD succeeded' do
       let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
-
       before do
         expect(service).to receive(:installation_phase).once.and_return(phase)
       end
@@ -67,7 +87,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
 
         service.execute
 
-        expect(application).to be_installed
+        expect(application).to be_updated
         expect(application.status_reason).to be_nil
       end
     end
@@ -83,33 +103,86 @@ describe Clusters::Applications::CheckInstallationProgressService do
       it 'make the application errored' do
         service.execute
 
-        expect(application).to be_errored
-        expect(application.status_reason).to eq("Installation failed. Check pod logs for install-helm for more details.")
+        expect(application).to be_update_errored
+        expect(application.status_reason).to eq('Operation failed. Check pod logs for install-helm for more details.')
       end
     end
 
-    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
+    context 'when timed out' do
+      let(:application) { create(:clusters_applications_helm, :timeouted, :updating) }
 
-    context 'when installation raises a Kubeclient::HttpError' do
-      let(:cluster) { create(:cluster, :provided_by_user, :project) }
+      before do
+        expect(service).to receive(:installation_phase).once.and_return(phase)
+      end
+
+      it 'make the application errored' do
+        expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
+
+        service.execute
+
+        expect(application).to be_update_errored
+        expect(application.status_reason).to eq('Operation timed out. Check pod logs for install-helm for more details.')
+      end
+    end
+  end
+
+  context 'when application is installing' do
+    include_examples 'error logging'
+
+    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
 
+    context 'when installation POD succeeded' do
+      let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
       before do
-        application.update!(cluster: cluster)
+        expect(service).to receive(:installation_phase).once.and_return(phase)
+      end
 
-        expect(service).to receive(:installation_phase).and_raise(Kubeclient::HttpError.new(401, 'Unauthorized', nil))
+      it 'removes the installation POD' do
+        expect(service).to receive(:remove_installation_pod).once
+
+        service.execute
       end
 
-      it 'shows the response code from the error' do
+      it 'make the application installed' do
+        expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
+
+        service.execute
+
+        expect(application).to be_installed
+        expect(application.status_reason).to be_nil
+      end
+    end
+
+    context 'when installation POD failed' do
+      let(:phase) { Gitlab::Kubernetes::Pod::FAILED }
+      let(:errors) { 'test installation failed' }
+
+      before do
+        expect(service).to receive(:installation_phase).once.and_return(phase)
+      end
+
+      it 'make the application errored' do
         service.execute
 
         expect(application).to be_errored
-        expect(application.status_reason).to eq('Kubernetes error: 401')
+        expect(application.status_reason).to eq('Operation failed. Check pod logs for install-helm for more details.')
+      end
+    end
+
+    context 'when timed out' do
+      let(:application) { create(:clusters_applications_helm, :timeouted) }
+
+      before do
+        expect(service).to receive(:installation_phase).once.and_return(phase)
       end
 
-      it 'should log error' do
-        expect(service.send(:logger)).to receive(:error)
+      it 'make the application errored' do
+        expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
 
         service.execute
+
+        expect(application).to be_errored
+        expect(application.status_reason).to eq('Operation timed out. Check pod logs for install-helm for more details.')
       end
     end
   end