Commit c604c437 authored by Mike Greiling's avatar Mike Greiling

fix broken specs

parent c99332a8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
- message = auto_devops_warning_message(@project) - message = auto_devops_warning_message(@project)
- ci_file_formatted = '<code>.gitlab-ci.yml</code>'.html_safe - ci_file_formatted = '<code>.gitlab-ci.yml</code>'.html_safe
- if message - if message
%p.settings-message.text-center %p.auto-devops-warning-message.settings-message.text-center
= message.html_safe = message.html_safe
= f.fields_for :auto_devops_attributes, @auto_devops do |form| = f.fields_for :auto_devops_attributes, @auto_devops do |form|
.card .card
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.form-text.text-muted .form-text.text-muted
= s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted } = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted }
.card.js-extra-settings{ class: form.object.enabled == false ? 'hidden' : nil } .card.js-extra-settings{ class: form.object&.enabled == false ? 'hidden' : nil }
.card-body.bg-light .card-body.bg-light
= form.label :domain do = form.label :domain do
%strong= _('Domain') %strong= _('Domain')
......
...@@ -12,7 +12,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do ...@@ -12,7 +12,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it 'shows warning message' do it 'shows warning message' do
render render
expect(rendered).to have_css('.settings-message') expect(rendered).to have_css('.auto-devops-warning-message')
expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name and a') expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name and a')
expect(rendered).to have_link('Kubernetes cluster') expect(rendered).to have_link('Kubernetes cluster')
end end
...@@ -26,7 +26,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do ...@@ -26,7 +26,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it 'shows warning message' do it 'shows warning message' do
render render
expect(rendered).to have_css('.settings-message') expect(rendered).to have_css('.auto-devops-warning-message')
expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a') expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a')
expect(rendered).to have_link('Kubernetes cluster') expect(rendered).to have_link('Kubernetes cluster')
end end
...@@ -42,7 +42,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do ...@@ -42,7 +42,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it 'shows warning message' do it 'shows warning message' do
render render
expect(rendered).to have_css('.settings-message') expect(rendered).to have_css('.auto-devops-warning-message')
expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name to work correctly.') expect(rendered).to have_text('Auto Review Apps and Auto Deploy need a domain name to work correctly.')
end end
end end
...@@ -55,7 +55,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do ...@@ -55,7 +55,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it 'does not show warning message' do it 'does not show warning message' do
render render
expect(rendered).not_to have_css('.settings-message') expect(rendered).not_to have_css('.auto-devops-warning-message')
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment