Merge branch '57319-hide-kubernetes-cluster-warning-if-project-has-cl…

…uster-related' into 'master'

Resolve "Hide Kubernetes cluster warning if project has cluster related"

See merge request gitlab-org/gitlab-ce!26749

app/views/projects/settings/ci_cd/_autodevops_form.html.haml

@@ -17,10 +17,11 @@
                     = s_('CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.')
                     = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank'
               .card-footer.js-extra-settings{ class: auto_devops_enabled || 'hidden' }
-                %p.settings-message.text-center
-                  - kubernetes_cluster_link = help_page_path('user/project/clusters/index')
-                  - kubernetes_cluster_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: kubernetes_cluster_link }
-                  = s_('CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly.').html_safe % { kubernetes_cluster_start: kubernetes_cluster_start, kubernetes_cluster_end: '</a>'.html_safe }
+                - if @project.all_clusters.empty?
+                  %p.settings-message.text-center
+                    - kubernetes_cluster_link = help_page_path('user/project/clusters/index')
+                    - kubernetes_cluster_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: kubernetes_cluster_link }
+                    = s_('CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly.').html_safe % { kubernetes_cluster_start: kubernetes_cluster_start, kubernetes_cluster_end: '</a>'.html_safe }
                 %label.prepend-top-10
                   %strong= s_('CICD|Deployment strategy')
                 .form-check

changelogs/unreleased/57319-hide-kubernetes-cluster-warning-if-project-has-cluster-related.yml

@@ -0,0 +1,5 @@
+---
+title: Resolve "Hide Kubernetes cluster warning if project has cluster related"
+merge_request: 26749
+author:
+type: fixed

spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb

@@ -13,4 +13,14 @@
 
     expect(rendered).to have_text('You must add a Kubernetes cluster integration to this project with a domain in order for your deployment strategy to work correctly.')
   end
+
+  context 'when the project has an available kubernetes cluster' do
+    let!(:cluster) { create(:cluster, cluster_type: :project_type, projects: [project]) }
+
+    it 'does not show a warning message' do
+      render
+
+      expect(rendered).not_to have_text('You must add a Kubernetes cluster')
+    end
+  end
 end