Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5db34a3c
Commit
5db34a3c
authored
Dec 17, 2019
by
Evan Read
Committed by
Ash McKenzie
Dec 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Harmonize capitalization on cluster UI
Capitalization now matches rest of UI page.
parent
12970a8a
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
17 deletions
+22
-17
app/helpers/clusters_helper.rb
app/helpers/clusters_helper.rb
+3
-3
changelogs/unreleased/eread-harmonize-capitalization-in-ui.yml
...elogs/unreleased/eread-harmonize-capitalization-in-ui.yml
+5
-0
ee/spec/features/projects/clusters_spec.rb
ee/spec/features/projects/clusters_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
spec/features/admin/clusters/eks_spec.rb
spec/features/admin/clusters/eks_spec.rb
+1
-1
spec/features/groups/clusters/eks_spec.rb
spec/features/groups/clusters/eks_spec.rb
+1
-1
spec/features/projects/clusters/eks_spec.rb
spec/features/projects/clusters/eks_spec.rb
+1
-1
spec/features/projects/clusters/gcp_spec.rb
spec/features/projects/clusters/gcp_spec.rb
+1
-1
spec/features/projects/clusters_spec.rb
spec/features/projects/clusters_spec.rb
+1
-1
spec/helpers/clusters_helper_spec.rb
spec/helpers/clusters_helper_spec.rb
+4
-4
No files found.
app/helpers/clusters_helper.rb
View file @
5db34a3c
...
@@ -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
C
luster on EKS'
)
s_
(
'ClusterIntegration|Create new
c
luster on EKS'
)
when
'gcp'
when
'gcp'
s_
(
'ClusterIntegration|Create new
C
luster on GKE'
)
s_
(
'ClusterIntegration|Create new
c
luster on GKE'
)
else
else
s_
(
'ClusterIntegration|Create new
C
luster'
)
s_
(
'ClusterIntegration|Create new
c
luster'
)
end
end
end
end
...
...
changelogs/unreleased/eread-harmonize-capitalization-in-ui.yml
0 → 100644
View file @
5db34a3c
---
title
:
Harmonize capitalization on cluster UI
merge_request
:
21878
author
:
Evan Read
type
:
other
ee/spec/features/projects/clusters_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster'
click_link
'Create new
c
luster'
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
C
luster'
click_link
'Create new
c
luster'
click_link
'Google GKE'
click_link
'Google GKE'
sleep
2
# wait for ajax
sleep
2
# wait for ajax
...
...
locale/gitlab.pot
View file @
5db34a3c
...
@@ -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
C
luster"
msgid "ClusterIntegration|Create new
c
luster"
msgstr ""
msgstr ""
msgid "ClusterIntegration|Create new
C
luster on EKS"
msgid "ClusterIntegration|Create new
c
luster on EKS"
msgstr ""
msgstr ""
msgid "ClusterIntegration|Create new
C
luster on GKE"
msgid "ClusterIntegration|Create new
c
luster on GKE"
msgstr ""
msgstr ""
msgid "ClusterIntegration|Creating Kubernetes cluster"
msgid "ClusterIntegration|Creating Kubernetes cluster"
...
...
spec/features/admin/clusters/eks_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster on EKS'
)
expect
(
page
).
to
have_content
(
'Create new
c
luster on EKS'
)
end
end
end
end
end
end
...
...
spec/features/groups/clusters/eks_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster on EKS'
)
expect
(
page
).
to
have_content
(
'Create new
c
luster on EKS'
)
end
end
end
end
end
end
...
...
spec/features/projects/clusters/eks_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster on EKS'
)
expect
(
page
).
to
have_content
(
'Create new
c
luster on EKS'
)
end
end
end
end
end
end
...
...
spec/features/projects/clusters/gcp_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster'
click_link
'Create new
c
luster'
click_link
'Google GKE'
click_link
'Google GKE'
end
end
...
...
spec/features/projects/clusters_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster'
click_link
'Create new
c
luster'
end
end
it
'user sees a link to create a GKE cluster'
do
it
'user sees a link to create a GKE cluster'
do
...
...
spec/helpers/clusters_helper_spec.rb
View file @
5db34a3c
...
@@ -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
C
luster on GKE'
)
}
it
{
is_expected
.
to
eq
(
'Create new
c
luster 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
C
luster on EKS'
)
}
it
{
is_expected
.
to
eq
(
'Create new
c
luster 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
C
luster'
)
}
it
{
is_expected
.
to
eq
(
'Create new
c
luster'
)
}
end
end
context
'no provider'
do
context
'no provider'
do
let
(
:provider
)
{
nil
}
let
(
:provider
)
{
nil
}
it
{
is_expected
.
to
eq
(
'Create new
C
luster'
)
}
it
{
is_expected
.
to
eq
(
'Create new
c
luster'
)
}
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment