Check whether new service created from template is valid after unflagging it as a template

2 files changed, 2 insertions, 2 deletions

diff --git a/app/models/service.rb b/app/models/service.rb
index 1d259bcfec7..ad835293b46 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -281,9 +281,9 @@ class Service < ActiveRecord::Base
 
   def self.build_from_template(project_id, template)
     service = template.dup
-    service.active = false unless service.valid?
     service.template = false
     service.project_id = project_id
+    service.active = false if service.active? && !service.valid?
     service
   end
 
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 28c908ea425..a849af062c5 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -78,7 +78,7 @@ describe Service do
       context 'when template is invalid' do
         it 'sets service template to inactive when template is invalid' do
           project = create(:project)
-          template = JiraService.new(template: true, active: true)
+          template = KubernetesService.new(template: true, active: true)
           template.save(validate: false)
 
           service = described_class.build_from_template(project.id, template)