Automatic merge of gitlab-org/gitlab-ce master

app/models/project_services/deployment_service.rb

@@ -11,7 +11,7 @@ class DeploymentService < Service
     %w()
   end
 
-  def predefined_variables
+  def predefined_variables(project:)
     []
   end
 

spec/factories/projects.rb

@@ -368,6 +368,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(

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

spec/models/project_spec.rb

@@ -2819,6 +2819,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