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
ac070525
Commit
ac070525
authored
Nov 10, 2020
by
Donald Cook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small testing tweaks
parent
68cef200
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
...settings_service_desk/components/service_desk_setting.vue
+2
-1
spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js
...ings_service_desk/components/service_desk_setting_spec.js
+8
-7
No files found.
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
View file @
ac070525
...
@@ -116,7 +116,8 @@ export default {
...
@@ -116,7 +116,8 @@ export default {
<input
<input
ref=
"service-desk-incoming-email"
ref=
"service-desk-incoming-email"
type=
"text"
type=
"text"
class=
"form-control incoming-email"
class=
"form-control"
data-testid=
"incoming-email"
:placeholder=
"__('Incoming email')"
:placeholder=
"__('Incoming email')"
:aria-label=
"__('Incoming email')"
:aria-label=
"__('Incoming email')"
aria-describedby=
"incoming-email-describer"
aria-describedby=
"incoming-email-describer"
...
...
spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js
View file @
ac070525
...
@@ -13,6 +13,7 @@ describe('ServiceDeskSetting', () => {
...
@@ -13,6 +13,7 @@ describe('ServiceDeskSetting', () => {
});
});
const
findTemplateDropdown
=
()
=>
wrapper
.
find
(
'
#service-desk-template-select
'
);
const
findTemplateDropdown
=
()
=>
wrapper
.
find
(
'
#service-desk-template-select
'
);
const
findIncomingEmail
=
()
=>
wrapper
.
find
(
'
[data-testid="incoming-email"]
'
);
describe
(
'
when isEnabled=true
'
,
()
=>
{
describe
(
'
when isEnabled=true
'
,
()
=>
{
describe
(
'
only isEnabled
'
,
()
=>
{
describe
(
'
only isEnabled
'
,
()
=>
{
...
@@ -35,7 +36,7 @@ describe('ServiceDeskSetting', () => {
...
@@ -35,7 +36,7 @@ describe('ServiceDeskSetting', () => {
it
(
'
should see loading spinner and not the incoming email
'
,
()
=>
{
it
(
'
should see loading spinner and not the incoming email
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
'
.incoming-email
'
).
exists
()).
toBe
(
false
);
expect
(
findIncomingEmail
(
).
exists
()).
toBe
(
false
);
});
});
});
});
});
});
...
@@ -73,7 +74,7 @@ describe('ServiceDeskSetting', () => {
...
@@ -73,7 +74,7 @@ describe('ServiceDeskSetting', () => {
});
});
it
(
'
should see email and not the loading spinner
'
,
()
=>
{
it
(
'
should see email and not the loading spinner
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.incoming-email
'
).
element
.
value
).
toEqual
(
incomingEmail
);
expect
(
findIncomingEmail
(
).
element
.
value
).
toEqual
(
incomingEmail
);
expect
(
wrapper
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
false
);
});
});
...
@@ -101,25 +102,25 @@ describe('ServiceDeskSetting', () => {
...
@@ -101,25 +102,25 @@ describe('ServiceDeskSetting', () => {
});
});
it
(
'
should see custom email
'
,
()
=>
{
it
(
'
should see custom email
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.incoming-email
'
).
element
.
value
).
toEqual
(
customEmail
);
expect
(
findIncomingEmail
(
).
element
.
value
).
toEqual
(
customEmail
);
});
});
});
});
describe
(
'
customEmail is the same as incomingEmail
'
,
()
=>
{
describe
(
'
customEmail is the same as incomingEmail
'
,
()
=>
{
const
customE
mail
=
'
foo@bar.com
'
;
const
e
mail
=
'
foo@bar.com
'
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
wrapper
=
mount
(
ServiceDeskSetting
,
{
wrapper
=
mount
(
ServiceDeskSetting
,
{
propsData
:
{
propsData
:
{
isEnabled
:
true
,
isEnabled
:
true
,
incomingEmail
:
customE
mail
,
incomingEmail
:
e
mail
,
customEmail
,
customEmail
:
email
,
},
},
});
});
});
});
it
(
'
should see custom email
'
,
()
=>
{
it
(
'
should see custom email
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.incoming-email
'
).
element
.
value
).
toEqual
(
customE
mail
);
expect
(
findIncomingEmail
().
element
.
value
).
toEqual
(
e
mail
);
});
});
});
});
});
});
...
...
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