Commit 5db34a3c authored by Evan Read's avatar Evan Read Committed by Ash McKenzie

Harmonize capitalization on cluster UI

Capitalization now matches rest of UI page.
parent 12970a8a
...@@ -9,11 +9,11 @@ module ClustersHelper ...@@ -9,11 +9,11 @@ module ClustersHelper
def create_new_cluster_label(provider: nil) def create_new_cluster_label(provider: nil)
case provider case provider
when 'aws' when 'aws'
s_('ClusterIntegration|Create new Cluster on EKS') s_('ClusterIntegration|Create new cluster on EKS')
when 'gcp' when 'gcp'
s_('ClusterIntegration|Create new Cluster on GKE') s_('ClusterIntegration|Create new cluster on GKE')
else else
s_('ClusterIntegration|Create new Cluster') s_('ClusterIntegration|Create new cluster')
end end
end end
......
---
title: Harmonize capitalization on cluster UI
merge_request: 21878
author: Evan Read
type: other
...@@ -111,7 +111,7 @@ describe 'EE Clusters', :js do ...@@ -111,7 +111,7 @@ describe 'EE Clusters', :js do
context 'when user filled form with environment scope' do context 'when user filled form with environment scope' do
before do before do
click_link 'Add Kubernetes cluster' click_link 'Add Kubernetes cluster'
click_link 'Create new Cluster' click_link 'Create new cluster'
click_link 'Google GKE' click_link 'Google GKE'
sleep 2 # wait for ajax sleep 2 # wait for ajax
...@@ -156,7 +156,7 @@ describe 'EE Clusters', :js do ...@@ -156,7 +156,7 @@ describe 'EE Clusters', :js do
context 'when user updates duplicated environment scope' do context 'when user updates duplicated environment scope' do
before do before do
click_link 'Add Kubernetes cluster' click_link 'Add Kubernetes cluster'
click_link 'Create new Cluster' click_link 'Create new cluster'
click_link 'Google GKE' click_link 'Google GKE'
sleep 2 # wait for ajax sleep 2 # wait for ajax
......
...@@ -3790,13 +3790,13 @@ msgstr "" ...@@ -3790,13 +3790,13 @@ msgstr ""
msgid "ClusterIntegration|Create cluster on" msgid "ClusterIntegration|Create cluster on"
msgstr "" msgstr ""
msgid "ClusterIntegration|Create new Cluster" msgid "ClusterIntegration|Create new cluster"
msgstr "" msgstr ""
msgid "ClusterIntegration|Create new Cluster on EKS" msgid "ClusterIntegration|Create new cluster on EKS"
msgstr "" msgstr ""
msgid "ClusterIntegration|Create new Cluster on GKE" msgid "ClusterIntegration|Create new cluster on GKE"
msgstr "" msgstr ""
msgid "ClusterIntegration|Creating Kubernetes cluster" msgid "ClusterIntegration|Creating Kubernetes cluster"
......
...@@ -22,7 +22,7 @@ describe 'Instance-level AWS EKS Cluster', :js do ...@@ -22,7 +22,7 @@ describe 'Instance-level AWS EKS Cluster', :js do
end end
it 'user sees a form to create an EKS cluster' do it 'user sees a form to create an EKS cluster' do
expect(page).to have_content('Create new Cluster on EKS') expect(page).to have_content('Create new cluster on EKS')
end end
end end
end end
......
...@@ -28,7 +28,7 @@ describe 'Group AWS EKS Cluster', :js do ...@@ -28,7 +28,7 @@ describe 'Group AWS EKS Cluster', :js do
end end
it 'user sees a form to create an EKS cluster' do it 'user sees a form to create an EKS cluster' do
expect(page).to have_content('Create new Cluster on EKS') expect(page).to have_content('Create new cluster on EKS')
end end
end end
end end
......
...@@ -28,7 +28,7 @@ describe 'AWS EKS Cluster', :js do ...@@ -28,7 +28,7 @@ describe 'AWS EKS Cluster', :js do
end end
it 'user sees a form to create an EKS cluster' do it 'user sees a form to create an EKS cluster' do
expect(page).to have_content('Create new Cluster on EKS') expect(page).to have_content('Create new cluster on EKS')
end end
end end
end end
......
...@@ -29,7 +29,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do ...@@ -29,7 +29,7 @@ describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do
visit project_clusters_path(project) visit project_clusters_path(project)
click_link 'Add Kubernetes cluster' click_link 'Add Kubernetes cluster'
click_link 'Create new Cluster' click_link 'Create new cluster'
click_link 'Google GKE' click_link 'Google GKE'
end end
......
...@@ -54,7 +54,7 @@ describe 'Clusters', :js do ...@@ -54,7 +54,7 @@ describe 'Clusters', :js do
visit project_clusters_path(project) visit project_clusters_path(project)
click_link 'Add Kubernetes cluster' click_link 'Add Kubernetes cluster'
click_link 'Create new Cluster' click_link 'Create new cluster'
end end
it 'user sees a link to create a GKE cluster' do it 'user sees a link to create a GKE cluster' do
......
...@@ -37,25 +37,25 @@ describe ClustersHelper do ...@@ -37,25 +37,25 @@ describe ClustersHelper do
context 'GCP provider' do context 'GCP provider' do
let(:provider) { 'gcp' } let(:provider) { 'gcp' }
it { is_expected.to eq('Create new Cluster on GKE') } it { is_expected.to eq('Create new cluster on GKE') }
end end
context 'AWS provider' do context 'AWS provider' do
let(:provider) { 'aws' } let(:provider) { 'aws' }
it { is_expected.to eq('Create new Cluster on EKS') } it { is_expected.to eq('Create new cluster on EKS') }
end end
context 'other provider' do context 'other provider' do
let(:provider) { 'other' } let(:provider) { 'other' }
it { is_expected.to eq('Create new Cluster') } it { is_expected.to eq('Create new cluster') }
end end
context 'no provider' do context 'no provider' do
let(:provider) { nil } let(:provider) { nil }
it { is_expected.to eq('Create new Cluster') } it { is_expected.to eq('Create new cluster') }
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