Merge branch '34758-fix-code-reuse-clusters-applications_controller' into 'master'

Fix code reuse issue in Projects::Clusters::ApplicationController#index

See merge request gitlab-org/gitlab-ce!22182

4 files changed, 90 insertions, 12 deletions

diff --git a/spec/services/applications/create_service_spec.rb b/spec/services/applications/create_service_spec.rb
index 9c43b56744b..c8134087fa1 100644
--- a/spec/services/applications/create_service_spec.rb
+++ b/spec/services/applications/create_service_spec.rb
@@ -1,17 +1,14 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe ::Applications::CreateService do
+  include TestRequestHelpers
+
   let(:user) { create(:user) }
   let(:params) { attributes_for(:application) }
-  let(:request) do
-    if Gitlab.rails5?
-      ActionController::TestRequest.new({ remote_ip: "127.0.0.1" }, ActionController::TestSession.new)
-    else
-      ActionController::TestRequest.new(remote_ip: "127.0.0.1")
-    end
-  end
 
   subject { described_class.new(user, params) }
 
-  it { expect { subject.execute(request) }.to change { Doorkeeper::Application.count }.by(1) }
+  it { expect { subject.execute(test_request) }.to change { Doorkeeper::Application.count }.by(1) }
 end
diff --git a/spec/services/clusters/applications/create_service_spec.rb b/spec/services/clusters/applications/create_service_spec.rb
new file mode 100644
index 00000000000..056db0c5486
--- /dev/null
+++ b/spec/services/clusters/applications/create_service_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::Applications::CreateService do
+  include TestRequestHelpers
+
+  let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+  let(:user) { create(:user) }
+  let(:params) { { application: 'helm' } }
+  let(:service) { described_class.new(cluster, user, params) }
+
+  describe '#execute' do
+    before do
+      allow(ClusterInstallAppWorker).to receive(:perform_async)
+    end
+
+    subject { service.execute(test_request) }
+
+    it 'creates an application' do
+      expect do
+        subject
+
+        cluster.reload
+      end.to change(cluster, :application_helm)
+    end
+
+    it 'schedules an install via worker' do
+      expect(ClusterInstallAppWorker).to receive(:perform_async).with('helm', anything).once
+
+      subject
+    end
+
+    context 'jupyter application' do
+      let(:params) do
+        {
+          application: 'jupyter',
+          hostname: 'example.com'
+        }
+      end
+
+      before do
+        allow_any_instance_of(Clusters::Applications::ScheduleInstallationService).to receive(:execute)
+      end
+
+      it 'creates the application' do
+        expect do
+          subject
+
+          cluster.reload
+        end.to change(cluster, :application_jupyter)
+      end
+
+      it 'sets the hostname' do
+        expect(subject.hostname).to eq('example.com')
+      end
+
+      it 'sets the oauth_application' do
+        expect(subject.oauth_application).to be_present
+      end
+    end
+
+    context 'invalid application' do
+      let(:params) { { application: 'non-existent' } }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(Clusters::Applications::CreateService::InvalidApplicationError)
+      end
+    end
+  end
+end
diff --git a/spec/services/clusters/applications/schedule_installation_service_spec.rb b/spec/services/clusters/applications/schedule_installation_service_spec.rb
index bca1e71bef2..21797edd533 100644
--- a/spec/services/clusters/applications/schedule_installation_service_spec.rb
+++ b/spec/services/clusters/applications/schedule_installation_service_spec.rb
@@ -10,14 +10,13 @@ describe Clusters::Applications::ScheduleInstallationService do
       expect(ClusterInstallAppWorker).not_to receive(:perform_async)
       count_before = count_scheduled
 
-      expect { service.execute(application) }.to raise_error(StandardError)
+      expect { service.execute }.to raise_error(StandardError)
       expect(count_scheduled).to eq(count_before)
     end
   end
 
   describe '#execute' do
-    let(:project) { double(:project) }
-    let(:service) { described_class.new(project, nil) }
+    let(:service) { described_class.new(application) }
 
     context 'when application is installable' do
       let(:application) { create(:clusters_applications_helm, :installable) }
@@ -25,7 +24,7 @@ describe Clusters::Applications::ScheduleInstallationService do
       it 'make the application scheduled' do
         expect(ClusterInstallAppWorker).to receive(:perform_async).with(application.name, kind_of(Numeric)).once
 
-        expect { service.execute(application) }.to change { application.class.with_status(:scheduled).count }.by(1)
+        expect { service.execute }.to change { application.class.with_status(:scheduled).count }.by(1)
       end
     end
 
diff --git a/spec/support/helpers/test_request_helpers.rb b/spec/support/helpers/test_request_helpers.rb
new file mode 100644
index 00000000000..187a0e07891
--- /dev/null
+++ b/spec/support/helpers/test_request_helpers.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module TestRequestHelpers
+  def test_request(remote_ip: '127.0.0.1')
+    if Gitlab.rails5?
+      ActionController::TestRequest.new({ remote_ip: remote_ip }, ActionController::TestSession.new)
+    else
+      ActionController::TestRequest.new(remote_ip: remote_ip)
+    end
+  end
+end