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
9b018302
Commit
9b018302
authored
Apr 02, 2020
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update tests for new knative domain picker
parent
297b677e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
9 deletions
+68
-9
spec/frontend/clusters/components/applications_spec.js
spec/frontend/clusters/components/applications_spec.js
+35
-6
spec/frontend/clusters/components/knative_domain_editor_spec.js
...rontend/clusters/components/knative_domain_editor_spec.js
+33
-3
No files found.
spec/frontend/clusters/components/applications_spec.js
View file @
9b018302
...
@@ -400,6 +400,10 @@ describe('Applications', () => {
...
@@ -400,6 +400,10 @@ describe('Applications', () => {
});
});
describe
(
'
Knative application
'
,
()
=>
{
describe
(
'
Knative application
'
,
()
=>
{
const
availableDomain
=
{
id
:
4
,
domain
:
'
newhostname.com
'
,
};
const
propsData
=
{
const
propsData
=
{
applications
:
{
applications
:
{
...
APPLICATIONS_MOCK_STATE
,
...
APPLICATIONS_MOCK_STATE
,
...
@@ -409,10 +413,11 @@ describe('Applications', () => {
...
@@ -409,10 +413,11 @@ describe('Applications', () => {
status
:
'
installed
'
,
status
:
'
installed
'
,
externalIp
:
'
1.1.1.1
'
,
externalIp
:
'
1.1.1.1
'
,
installed
:
true
,
installed
:
true
,
availableDomains
:
[
availableDomain
],
pagesDomain
:
null
,
},
},
},
},
};
};
const
newHostname
=
'
newhostname.com
'
;
let
wrapper
;
let
wrapper
;
let
knativeDomainEditor
;
let
knativeDomainEditor
;
...
@@ -428,20 +433,44 @@ describe('Applications', () => {
...
@@ -428,20 +433,44 @@ describe('Applications', () => {
});
});
it
(
'
emits saveKnativeDomain event when knative domain editor emits save event
'
,
()
=>
{
it
(
'
emits saveKnativeDomain event when knative domain editor emits save event
'
,
()
=>
{
knativeDomainEditor
.
vm
.
$emit
(
'
save
'
,
newHostname
);
propsData
.
applications
.
knative
.
hostname
=
availableDomain
.
domain
;
propsData
.
applications
.
knative
.
pagesDomain
=
availableDomain
;
knativeDomainEditor
.
vm
.
$emit
(
'
save
'
);
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
saveKnativeDomain
'
,
{
id
:
'
knative
'
,
params
:
{
hostname
:
availableDomain
.
domain
,
pages_domain_id
:
availableDomain
.
id
,
},
});
});
it
(
'
emits saveKnativeDomain event when knative domain editor emits save event with custom domain
'
,
()
=>
{
const
newHostName
=
'
someothernewhostname.com
'
;
propsData
.
applications
.
knative
.
hostname
=
newHostName
;
propsData
.
applications
.
knative
.
pagesDomain
=
null
;
knativeDomainEditor
.
vm
.
$emit
(
'
save
'
);
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
saveKnativeDomain
'
,
{
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
saveKnativeDomain
'
,
{
id
:
'
knative
'
,
id
:
'
knative
'
,
params
:
{
hostname
:
newHostname
},
params
:
{
hostname
:
newHostName
,
pages_domain_id
:
undefined
,
},
});
});
});
});
it
(
'
emits setKnativeHostname event when knative domain editor emits change event
'
,
()
=>
{
it
(
'
emits setKnativeHostname event when knative domain editor emits change event
'
,
()
=>
{
wrapper
.
find
(
KnativeDomainEditor
).
vm
.
$emit
(
'
set
'
,
newHostname
);
wrapper
.
find
(
KnativeDomainEditor
).
vm
.
$emit
(
'
set
'
,
{
domain
:
availableDomain
.
domain
,
domainId
:
availableDomain
.
id
,
});
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
setKnative
Hostname
'
,
{
expect
(
eventHub
.
$emit
).
toHaveBeenCalledWith
(
'
setKnative
Domain
'
,
{
id
:
'
knative
'
,
id
:
'
knative
'
,
hostname
:
newHostname
,
domain
:
availableDomain
.
domain
,
domainId
:
availableDomain
.
id
,
});
});
});
});
});
});
...
...
spec/frontend/clusters/components/knative_domain_editor_spec.js
View file @
9b018302
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlDropdownItem
}
from
'
@gitlab/ui
'
;
import
KnativeDomainEditor
from
'
~/clusters/components/knative_domain_editor.vue
'
;
import
KnativeDomainEditor
from
'
~/clusters/components/knative_domain_editor.vue
'
;
import
LoadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
LoadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
{
APPLICATION_STATUS
}
from
'
~/clusters/constants
'
;
import
{
APPLICATION_STATUS
}
from
'
~/clusters/constants
'
;
...
@@ -80,7 +81,7 @@ describe('KnativeDomainEditor', () => {
...
@@ -80,7 +81,7 @@ describe('KnativeDomainEditor', () => {
it
(
'
triggers save event and pass current knative hostname
'
,
()
=>
{
it
(
'
triggers save event and pass current knative hostname
'
,
()
=>
{
wrapper
.
find
(
LoadingButton
).
vm
.
$emit
(
'
click
'
);
wrapper
.
find
(
LoadingButton
).
vm
.
$emit
(
'
click
'
);
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
emitted
(
'
save
'
)[
0
]).
toEqual
([
knative
.
hostname
]);
expect
(
wrapper
.
emitted
(
'
save
'
)[
0
]).
toEqual
([]);
});
});
});
});
});
});
...
@@ -104,14 +105,43 @@ describe('KnativeDomainEditor', () => {
...
@@ -104,14 +105,43 @@ describe('KnativeDomainEditor', () => {
describe
(
'
when knative domain name input changes
'
,
()
=>
{
describe
(
'
when knative domain name input changes
'
,
()
=>
{
it
(
'
emits "set" event with updated domain name
'
,
()
=>
{
it
(
'
emits "set" event with updated domain name
'
,
()
=>
{
createComponent
({
knative
});
const
newDomain
=
{
id
:
4
,
domain
:
'
newhostname.com
'
,
};
createComponent
({
knative
:
{
...
knative
,
availableDomains
:
[
newDomain
]
}
});
jest
.
spyOn
(
wrapper
.
vm
,
'
selectDomain
'
);
wrapper
.
find
(
GlDropdownItem
).
vm
.
$emit
(
'
click
'
);
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
vm
.
selectDomain
).
toHaveBeenCalledWith
(
newDomain
);
expect
(
wrapper
.
emitted
(
'
set
'
)[
0
]).
toEqual
([
{
domain
:
newDomain
.
domain
,
domainId
:
newDomain
.
id
,
},
]);
});
});
it
(
'
emits "set" event with updated custom domain name
'
,
()
=>
{
const
newHostname
=
'
newhostname.com
'
;
const
newHostname
=
'
newhostname.com
'
;
createComponent
({
knative
});
jest
.
spyOn
(
wrapper
.
vm
,
'
selectCustomDomain
'
);
wrapper
.
setData
({
knativeHostname
:
newHostname
});
wrapper
.
setData
({
knativeHostname
:
newHostname
});
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
wrapper
.
emitted
(
'
set
'
)[
0
]).
toEqual
([
newHostname
]);
expect
(
wrapper
.
vm
.
selectCustomDomain
).
toHaveBeenCalledWith
(
newHostname
);
expect
(
wrapper
.
emitted
(
'
set
'
)[
0
]).
toEqual
([
{
domain
:
newHostname
,
domainId
:
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