diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-07-05 15:58:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-07-05 15:58:09 +0000 |
| commit | 7eddfef439c4a1d2388de12f4c06b0671a6ed7f1 (patch) | |
| tree | 75bf2da9d27a6ea189c78309a3d948fc9ba42d0b /spec/models | |
| parent | 633ac497e501d2419fd0f6fcdfb395e13f5f4ba6 (diff) | |
| parent | cf79a87e6cd12d3e142fec790e2aa9e40e69d813 (diff) | |
| download | gitlab-ce-7eddfef439c4a1d2388de12f4c06b0671a6ed7f1.tar.gz | |
Merge branch 'dm-invalid-active-service-template' into 'master'
Deactivate new KubernetesService created from active template to prevent project creation from failing
Closes gitlab-ee#6753
See merge request gitlab-org/gitlab-ce!20400
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |