summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2018-02-22 10:01:08 -0600
committerEric Eastwood <contact@ericeastwood.com>2018-02-22 10:01:08 -0600
commitdcac35b48487bb18fb5d9e59dcd3690627a20bbf (patch)
tree378c6bc8ef5d136f3bde84f25c8e2da834d4bf68
parent2e29597c942a524d206895510a10c541ff724c71 (diff)
downloadgitlab-ce-dcac35b48487bb18fb5d9e59dcd3690627a20bbf.tar.gz
Update enabled Kubernetes cluster button to "Kubernetes configured"
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16900#note_60175507
-rw-r--r--app/presenters/project_presenter.rb2
-rw-r--r--spec/features/projects/show_project_spec.rb6
-rw-r--r--spec/presenters/project_presenter_spec.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 5a46342d47a..f850f6273a3 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -271,7 +271,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
end
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)
end
end
diff --git a/spec/features/projects/show_project_spec.rb b/spec/features/projects/show_project_spec.rb
index 0bd13a17dc9..0a014e9f080 100644
--- a/spec/features/projects/show_project_spec.rb
+++ b/spec/features/projects/show_project_spec.rb
@@ -111,7 +111,7 @@ describe 'Project show page', :feature do
visit project_path(project)
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
@@ -149,7 +149,7 @@ describe 'Project show page', :feature do
it 'no Kubernetes cluster button if can not manage clusters' do
page.within('.project-stats') do
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
@@ -292,7 +292,7 @@ describe 'Project show page', :feature do
visit project_path(project)
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
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 3a3423c99c8..f8c93d91ec5 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -333,7 +333,7 @@ describe ProjectPresenter do
cluster = create(:cluster, projects: [project])
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)))
end
@@ -343,7 +343,7 @@ describe ProjectPresenter do
create(:cluster, projects: [project])
expect(presenter.kubernetes_cluster_anchor_data).to eq(OpenStruct.new(enabled: true,
- label: 'Kubernetes clusters',
+ label: 'Kubernetes configured',
link: presenter.project_clusters_path(project)))
end