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
18b1b5be
Commit
18b1b5be
authored
Feb 22, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use value attribute in ip input
Removes double quoted string
parent
0103958d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+3
-3
spec/features/projects/clusters/applications_spec.rb
spec/features/projects/clusters/applications_spec.rb
+2
-2
spec/javascripts/clusters/components/applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+4
-2
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
18b1b5be
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
<template
v-if=
"ingressInstalled"
>
<template
v-if=
"ingressInstalled"
>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"ingress-ip-address"
>
<label
for=
"ingress-ip-address"
>
{{
s__
(
"
ClusterIntegration| Ingress IP Address
"
)
}}
{{
s__
(
'
ClusterIntegration| Ingress IP Address
'
)
}}
</label>
</label>
<div
<div
v-if=
"ingressExternalIp"
v-if=
"ingressExternalIp"
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
type=
"text"
type=
"text"
id=
"ingress-ip-address"
id=
"ingress-ip-address"
class=
"form-control js-ip-address"
class=
"form-control js-ip-address"
:
placeholder
=
"ingressExternalIp"
:
value
=
"ingressExternalIp"
readonly
readonly
/>
/>
<span
class=
"input-group-btn"
>
<span
class=
"input-group-btn"
>
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
type=
"text"
type=
"text"
class=
"form-control js-ip-address"
class=
"form-control js-ip-address"
readonly
readonly
placeholder
=
"?"
value
=
"?"
/>
/>
</div>
</div>
...
...
spec/features/projects/clusters/applications_spec.rb
View file @
18b1b5be
...
@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do
...
@@ -99,13 +99,13 @@ feature 'Clusters Applications', :js do
expect
(
page
.
find
(
:css
,
'.js-cluster-application-install-button'
)[
'disabled'
]).
to
eq
(
'true'
)
expect
(
page
.
find
(
:css
,
'.js-cluster-application-install-button'
)[
'disabled'
]).
to
eq
(
'true'
)
expect
(
page
.
find
(
:css
,
'.js-cluster-application-install-button'
)).
to
have_content
(
'Installed'
)
expect
(
page
.
find
(
:css
,
'.js-cluster-application-install-button'
)).
to
have_content
(
'Installed'
)
expect
(
page
).
to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
).
to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
.
find
(
:css
,
'input.js-ip-address'
)[
'placeholder'
]
).
to
eq
(
'?'
)
expect
(
page
.
find
(
'.js-ip-address'
).
value
).
to
eq
(
'?'
)
# We receive the external IP address and display
# We receive the external IP address and display
Clusters
::
Cluster
.
last
.
application_ingress
.
update!
(
external_ip:
'192.168.1.100'
)
Clusters
::
Cluster
.
last
.
application_ingress
.
update!
(
external_ip:
'192.168.1.100'
)
expect
(
page
).
not_to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
).
not_to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
.
find
(
:css
,
'input.js-ip-address'
)[
'placeholder'
]
).
to
eq
(
'192.168.1.100'
)
expect
(
page
.
find
(
'.js-ip-address'
).
value
).
to
eq
(
'192.168.1.100'
)
end
end
expect
(
page
).
to
have_content
(
'Ingress was successfully installed on your Kubernetes cluster'
)
expect
(
page
).
to
have_content
(
'Ingress was successfully installed on your Kubernetes cluster'
)
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
18b1b5be
...
@@ -61,9 +61,11 @@ describe('Applications', () => {
...
@@ -61,9 +61,11 @@ describe('Applications', () => {
prometheus
:
{
title
:
'
Prometheus
'
},
prometheus
:
{
title
:
'
Prometheus
'
},
},
},
});
});
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.js-ip-address
'
).
getAttribute
(
'
placeholder
'
)
,
vm
.
$el
.
querySelector
(
'
.js-ip-address
'
).
value
,
).
toEqual
(
'
0.0.0.0
'
);
).
toEqual
(
'
0.0.0.0
'
);
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.js-clipboard-btn
'
).
getAttribute
(
'
data-clipboard-text
'
),
vm
.
$el
.
querySelector
(
'
.js-clipboard-btn
'
).
getAttribute
(
'
data-clipboard-text
'
),
).
toEqual
(
'
0.0.0.0
'
);
).
toEqual
(
'
0.0.0.0
'
);
...
@@ -85,7 +87,7 @@ describe('Applications', () => {
...
@@ -85,7 +87,7 @@ describe('Applications', () => {
});
});
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.js-ip-address
'
).
getAttribute
(
'
placeholder
'
)
,
vm
.
$el
.
querySelector
(
'
.js-ip-address
'
).
value
,
).
toEqual
(
'
?
'
);
).
toEqual
(
'
?
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-no-ip-message
'
)).
not
.
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-no-ip-message
'
)).
not
.
toBe
(
null
);
...
...
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