Merge branch 'fix_deployment_service_predefined_variables' into 'master'

Add missing argument to DeploymentService#predefined_variables

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

4 files changed, 19 insertions, 1 deletions

diff --git a/app/models/project_services/deployment_service.rb b/app/models/project_services/deployment_service.rb
index 6dae4f3a4a6..80aa2101509 100644
--- a/app/models/project_services/deployment_service.rb
+++ b/app/models/project_services/deployment_service.rb
@@ -11,7 +11,7 @@ class DeploymentService < Service
     %w()
   end
 
-  def predefined_variables
+  def predefined_variables(project:)
     []
   end
 
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 18fab395cc2..f7ef34d773b 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -322,6 +322,10 @@ FactoryBot.define do
     kubernetes_service
   end
 
+  factory :mock_deployment_project, parent: :project do
+    mock_deployment_service
+  end
+
   factory :prometheus_project, parent: :project do
     after :create do |project|
       project.create_prometheus_service(
diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index 5be56a49903..0d8c26a2ee9 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -26,6 +26,12 @@ FactoryBot.define do
     })
   end
 
+  factory :mock_deployment_service do
+    project
+    type 'MockDeploymentService'
+    active true
+  end
+
   factory :prometheus_service do
     project
     active true
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c1767ed0535..ac9362339e5 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2548,6 +2548,14 @@ describe Project do
       end
     end
 
+    context 'when project uses mock deployment service' do
+      let(:project) { create(:mock_deployment_project) }
+
+      it 'returns an empty array' do
+        expect(project.deployment_variables).to eq []
+      end
+    end
+
     context 'when project has a deployment service' do
       shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
         it 'returns variables from this service' do