BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e1d587f5
Unverified
Commit
e1d587f5
authored
Feb 20, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate ID
parent
5aa4d7bf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
applications.vue
app/assets/javascripts/clusters/components/applications.vue
+2
-3
applications_spec.rb
spec/features/projects/clusters/applications_spec.rb
+2
-2
applications_spec.js
spec/javascripts/clusters/components/applications_spec.js
+3
-3
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
e1d587f5
...
...
@@ -179,7 +179,7 @@
<input
type=
"text"
id=
"ipAddress"
class=
"form-control"
class=
"form-control
js-ip-address
"
:placeholder=
"ingressExternalIp"
readonly
/>
...
...
@@ -194,8 +194,7 @@
<input
v-else
type=
"text"
id=
"ipAddress"
class=
"form-control"
class=
"form-control js-ip-address"
readonly
placeholder=
"?"
/>
...
...
spec/features/projects/clusters/applications_spec.rb
View file @
e1d587f5
...
...
@@ -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'
)).
to
have_content
(
'Installed'
)
expect
(
page
).
to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
.
find
(
:css
,
'input
#ipA
ddress'
)[
'placeholder'
]).
to
eq
(
'?'
)
expect
(
page
.
find
(
:css
,
'input
.js-ip-a
ddress'
)[
'placeholder'
]).
to
eq
(
'?'
)
# We receive the external IP address and display
Clusters
::
Cluster
.
last
.
application_ingress
.
update!
(
external_ip:
'192.168.1.100'
)
expect
(
page
).
not_to
have_selector
(
'.js-no-ip-message'
)
expect
(
page
.
find
(
:css
,
'input
#ipA
ddress'
)[
'placeholder'
]).
to
eq
(
'192.168.1.100'
)
expect
(
page
.
find
(
:css
,
'input
.js-ip-a
ddress'
)[
'placeholder'
]).
to
eq
(
'192.168.1.100'
)
end
expect
(
page
).
to
have_content
(
'Ingress was successfully installed on your Kubernetes cluster'
)
...
...
spec/javascripts/clusters/components/applications_spec.js
View file @
e1d587f5
...
...
@@ -62,7 +62,7 @@ describe('Applications', () => {
},
});
expect
(
vm
.
$el
.
querySelector
(
'
#ipA
ddress'
).
getAttribute
(
'placeholder'
),
vm
.
$el
.
querySelector
(
'
.js-ip-a
ddress'
).
getAttribute
(
'placeholder'
),
).
toEqual
(
'0.0.0.0'
);
expect
(
vm
.
$el
.
querySelector
(
'.js-clipboard-btn'
).
getAttribute
(
'data-clipboard-text'
),
...
...
@@ -85,7 +85,7 @@ describe('Applications', () => {
});
expect
(
vm
.
$el
.
querySelector
(
'
#ipA
ddress'
).
getAttribute
(
'placeholder'
),
vm
.
$el
.
querySelector
(
'
.js-ip-a
ddress'
).
getAttribute
(
'placeholder'
),
).
toEqual
(
'?'
);
expect
(
...
...
@@ -109,7 +109,7 @@ describe('Applications', () => {
});
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'Ingress IP Address'
);
expect
(
vm
.
$el
.
querySelector
(
'
#ipA
ddress'
)).
toBe
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-ip-a
ddress'
)).
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