diff options
| -rw-r--r-- | app/helpers/auto_devops_helper.rb | 10 | ||||
| -rw-r--r-- | spec/helpers/auto_devops_helper_spec.rb | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb index fa65ddf6b03..4a7b7ff763b 100644 --- a/app/helpers/auto_devops_helper.rb +++ b/app/helpers/auto_devops_helper.rb @@ -9,28 +9,28 @@ module AutoDevopsHelper end def auto_devops_warning_message(project) - if missing_service?(project) + if missing_auto_devops_service?(project) params = { kubernetes: link_to('Kubernetes cluster', project_clusters_path(project)) } - if missing_domain?(project) + if missing_auto_devops_domain?(project) _('Auto Review Apps and Auto Deploy need a domain name and a %{kubernetes} to work correctly.') % params else _('Auto Review Apps and Auto Deploy need a %{kubernetes} to work correctly.') % params end - elsif missing_domain?(project) + elsif missing_auto_devops_domain?(project) _('Auto Review Apps and Auto Deploy need a domain name to work correctly.') end end private - def missing_domain?(project) + def missing_auto_devops_domain?(project) !(project.auto_devops&.has_domain? || current_application_settings.auto_devops_domain.present?) end - def missing_service?(project) + def missing_auto_devops_service?(project) !project.deployment_platform&.active? end end diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb index 1fcbad5875d..1950c2b129b 100644 --- a/spec/helpers/auto_devops_helper_spec.rb +++ b/spec/helpers/auto_devops_helper_spec.rb @@ -88,12 +88,12 @@ describe AutoDevopsHelper do context 'when the service is missing' do before do - allow(helper).to receive(:missing_service?).and_return(true) + allow(helper).to receive(:missing_auto_devops_service?).and_return(true) end context 'when the domain is missing' do before do - allow(helper).to receive(:missing_domain?).and_return(true) + allow(helper).to receive(:missing_auto_devops_domain?).and_return(true) end it { is_expected.to match(/Auto Review Apps and Auto Deploy need a domain name and a .* to work correctly./) } @@ -101,7 +101,7 @@ describe AutoDevopsHelper do context 'when the domain is not missing' do before do - allow(helper).to receive(:missing_domain?).and_return(false) + allow(helper).to receive(:missing_auto_devops_domain?).and_return(false) end it { is_expected.to match(/Auto Review Apps and Auto Deploy need a .* to work correctly./) } @@ -110,8 +110,8 @@ describe AutoDevopsHelper do context 'when the domain is missing' do before do - allow(helper).to receive(:missing_service?).and_return(false) - allow(helper).to receive(:missing_domain?).and_return(true) + allow(helper).to receive(:missing_auto_devops_service?).and_return(false) + allow(helper).to receive(:missing_auto_devops_domain?).and_return(true) end it { is_expected.to eq('Auto Review Apps and Auto Deploy need a domain name to work correctly.') } |