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
5e59bd71
Commit
5e59bd71
authored
May 07, 2018
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update rspec tests
parent
81d769ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
+15
-6
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
...luster_dropdowns/components/gke_machine_type_dropdown.vue
+1
-1
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
..._cluster_dropdowns/components/gke_project_id_dropdown.vue
+1
-1
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
...ts/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
+1
-1
spec/features/projects/clusters/gcp_spec.rb
spec/features/projects/clusters/gcp_spec.rb
+12
-3
No files found.
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue
View file @
5e59bd71
...
...
@@ -115,7 +115,7 @@ export default {
<
template
>
<div
class=
"dropdown"
class=
"
js-gcp-machine-type-dropdown
dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
<dropdown-hidden-input
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
View file @
5e59bd71
...
...
@@ -132,7 +132,7 @@ export default {
<
template
>
<div>
<div
class=
"dropdown"
class=
"
js-gcp-project-id-dropdown
dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
<dropdown-hidden-input
...
...
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue
View file @
5e59bd71
...
...
@@ -100,7 +100,7 @@ export default {
<
template
>
<div
class=
"dropdown"
class=
"
js-gcp-zone-dropdown
dropdown"
:class=
"
{ 'gl-show-field-errors': hasErrors }"
>
<dropdown-hidden-input
...
...
spec/features/projects/clusters/gcp_spec.rb
View file @
5e59bd71
...
...
@@ -42,8 +42,16 @@ feature 'Gcp Cluster', :js do
allow
(
WaitForClusterCreationWorker
).
to
receive
(
:perform_in
).
and_return
(
nil
)
fill_in
'cluster_provider_gcp_attributes_gcp_project_id'
,
with:
'gcp-project-123'
fill_in
'cluster_name'
,
with:
'dev-cluster'
execute_script
(
'document.querySelector(".js-gke-cluster-creation-submit").removeAttribute("disabled")'
)
sleep
2
# wait for ajax
execute_script
(
'document.querySelector(".js-gcp-project-id-dropdown input").setAttribute("type", "text")'
)
execute_script
(
'document.querySelector(".js-gcp-zone-dropdown input").setAttribute("type", "text")'
)
execute_script
(
'document.querySelector(".js-gcp-machine-type-dropdown input").setAttribute("type", "text")'
)
fill_in
'cluster[name]'
,
with:
'dev-cluster'
fill_in
'cluster[provider_gcp_attributes][gcp_project_id]'
,
with:
'gcp-project-123'
fill_in
'cluster[provider_gcp_attributes][zone]'
,
with:
'us-central1-a'
fill_in
'cluster[provider_gcp_attributes][machine_type]'
,
with:
'n1-standard-2'
click_button
'Create Kubernetes cluster'
end
...
...
@@ -55,7 +63,7 @@ feature 'Gcp Cluster', :js do
expect
(
page
).
to
have_content
(
'Kubernetes cluster was successfully created on Google Kubernetes Engine'
)
end
it
'user sees a error if something w
or
ng during creation'
do
it
'user sees a error if something w
ro
ng during creation'
do
expect
(
page
).
to
have_content
(
'Kubernetes cluster is being created on Google Kubernetes Engine...'
)
Clusters
::
Cluster
.
last
.
provider
.
make_errored!
(
'Something wrong!'
)
...
...
@@ -66,6 +74,7 @@ feature 'Gcp Cluster', :js do
context
'when user filled form with invalid parameters'
do
before
do
execute_script
(
'document.querySelector(".js-gke-cluster-creation-submit").removeAttribute("disabled")'
)
click_button
'Create Kubernetes cluster'
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