Commit 592690c1 authored by Eric Eastwood's avatar Eric Eastwood

Update enabled Kubernetes cluster button to "Kubernetes configured"

See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60175507
parent 392e7de7
...@@ -271,7 +271,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated ...@@ -271,7 +271,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
end end
OpenStruct.new(enabled: !clusters.empty?, OpenStruct.new(enabled: !clusters.empty?,
label: clusters.empty? ? _('Add Kubernetes cluster') : n_('Kubernetes cluster', 'Kubernetes clusters', clusters.size), label: clusters.empty? ? _('Add Kubernetes cluster') : _('Kubernetes configured'),
link: cluster_link) link: cluster_link)
end end
end end
......
...@@ -111,7 +111,7 @@ describe 'Project show page', :feature do ...@@ -111,7 +111,7 @@ describe 'Project show page', :feature do
visit project_path(project) visit project_path(project)
page.within('.project-stats') do page.within('.project-stats') do
expect(page).to have_link('Kubernetes cluster', href: project_cluster_path(project, cluster)) expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
end end
end end
end end
...@@ -149,7 +149,7 @@ describe 'Project show page', :feature do ...@@ -149,7 +149,7 @@ describe 'Project show page', :feature do
it 'no Kubernetes cluster button if can not manage clusters' do it 'no Kubernetes cluster button if can not manage clusters' do
page.within('.project-stats') do page.within('.project-stats') do
expect(page).not_to have_link('Add Kubernetes cluster') expect(page).not_to have_link('Add Kubernetes cluster')
expect(page).not_to have_link('Kubernetes cluster') expect(page).not_to have_link('Kubernetes configured')
end end
end end
end end
...@@ -292,7 +292,7 @@ describe 'Project show page', :feature do ...@@ -292,7 +292,7 @@ describe 'Project show page', :feature do
visit project_path(project) visit project_path(project)
page.within('.project-stats') do page.within('.project-stats') do
expect(page).to have_link('Kubernetes cluster', href: project_cluster_path(project, cluster)) expect(page).to have_link('Kubernetes configured', href: project_cluster_path(project, cluster))
end end
end end
end end
......
...@@ -333,7 +333,7 @@ describe ProjectPresenter do ...@@ -333,7 +333,7 @@ describe ProjectPresenter do
cluster = create(:cluster, projects: [project]) cluster = create(:cluster, projects: [project])
expect(presenter.kubernetes_cluster_anchor_data).to eq(OpenStruct.new(enabled: true, expect(presenter.kubernetes_cluster_anchor_data).to eq(OpenStruct.new(enabled: true,
label: 'Kubernetes cluster', label: 'Kubernetes configured',
link: presenter.project_cluster_path(project, cluster))) link: presenter.project_cluster_path(project, cluster)))
end end
...@@ -343,7 +343,7 @@ describe ProjectPresenter do ...@@ -343,7 +343,7 @@ describe ProjectPresenter do
create(:cluster, projects: [project]) create(:cluster, projects: [project])
expect(presenter.kubernetes_cluster_anchor_data).to eq(OpenStruct.new(enabled: true, expect(presenter.kubernetes_cluster_anchor_data).to eq(OpenStruct.new(enabled: true,
label: 'Kubernetes clusters', label: 'Kubernetes configured',
link: presenter.project_clusters_path(project))) link: presenter.project_clusters_path(project)))
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