Skip to content

Commit b476462

Browse files
committed
Bug 1665051 [wpt PR 25538] - [WPT] Refactor credential-management to use test-only-api.js, a=testonly
Automatic update from web-platform-tests [WPT] Refactor credential-management to use test-only-api.js With necessary changes to make Mojo lite bindings available in WPT: * Release mojo/public/mojom/base/*.mojom*.js (mojo_bindings_lite.js was already released). * Add an optional `lite` param to loadMojoResources(). Fixed: 1123987, 1126628 Change-Id: I35d37aa848e7a6333e6185450280c44afd6438c8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2410676 Reviewed-by: Michael Moss <mmosschromium.org> Reviewed-by: Reilly Grant <reillygchromium.org> Commit-Queue: Robert Ma <robertmachromium.org> Cr-Commit-Position: refs/heads/master{#807253} -- wpt-commits: 1d14e821b9586f250e6a31d550504e3d16a05ae7 wpt-pr: 25538 UltraBlame original commit: dad875f33a2fee5b926ef27a1e1ed0ca57153e98
1 parent 227e680 commit b476462

File tree

5 files changed

+231
-123
lines changed

5 files changed

+231
-123
lines changed

testing/web-platform/tests/credential-management/otpcredential-get-basics.https.html

+19
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,27 @@
7474
src
7575
=
7676
"
77+
/
78+
resources
79+
/
80+
test
81+
-
82+
only
83+
-
84+
api
7785
.
86+
js
87+
"
88+
>
89+
<
7890
/
91+
script
92+
>
93+
<
94+
script
95+
src
96+
=
97+
"
7998
support
8099
/
81100
otpcredential

testing/web-platform/tests/credential-management/support/README.md

+27-3
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,39 @@ Usage
4646
1
4747
.
4848
Include
49+
the
50+
following
51+
in
52+
your
53+
test
54+
:
55+
html
4956
<
5057
script
5158
src
5259
=
5360
"
61+
/
62+
resources
63+
/
64+
test
65+
-
66+
only
67+
-
68+
api
5469
.
70+
js
71+
"
72+
>
73+
<
5574
/
75+
script
76+
>
77+
<
78+
script
79+
src
80+
=
81+
"
5682
support
5783
/
5884
otpcredential
@@ -66,13 +92,11 @@ js
6692
/
6793
script
6894
>
69-
in
70-
your
71-
test
7295
2
7396
.
7497
Set
7598
expectations
99+
javascript
76100
await
77101
expect
78102
(

testing/web-platform/tests/credential-management/support/otpcredential-helper.js

+48-120
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,18 @@ use
33
strict
44
'
55
;
6+
const
7+
Status
8+
=
9+
{
10+
}
11+
;
612
async
713
function
814
loadChromiumResources
915
(
1016
)
1117
{
12-
if
13-
(
14-
!
15-
window
16-
.
17-
MojoInterfaceInterceptor
18-
)
19-
{
20-
return
21-
;
22-
}
2318
const
2419
resources
2520
=
@@ -28,22 +23,6 @@ resources
2823
/
2924
gen
3025
/
31-
layout_test_data
32-
/
33-
mojo
34-
/
35-
public
36-
/
37-
js
38-
/
39-
mojo_bindings_lite
40-
.
41-
js
42-
'
43-
'
44-
/
45-
gen
46-
/
4726
mojo
4827
/
4928
public
@@ -82,6 +61,18 @@ lite
8261
.
8362
js
8463
'
64+
]
65+
;
66+
await
67+
loadMojoResources
68+
(
69+
resources
70+
true
71+
)
72+
;
73+
await
74+
loadScript
75+
(
8576
'
8677
/
8778
resources
@@ -96,87 +87,6 @@ receiver
9687
.
9788
js
9889
'
99-
]
100-
;
101-
await
102-
Promise
103-
.
104-
all
105-
(
106-
resources
107-
.
108-
map
109-
(
110-
path
111-
=
112-
>
113-
{
114-
const
115-
script
116-
=
117-
document
118-
.
119-
createElement
120-
(
121-
'
122-
script
123-
'
124-
)
125-
;
126-
script
127-
.
128-
src
129-
=
130-
path
131-
;
132-
script
133-
.
134-
async
135-
=
136-
false
137-
;
138-
const
139-
promise
140-
=
141-
new
142-
Promise
143-
(
144-
(
145-
resolve
146-
reject
147-
)
148-
=
149-
>
150-
{
151-
script
152-
.
153-
onload
154-
=
155-
resolve
156-
;
157-
script
158-
.
159-
onerror
160-
=
161-
reject
162-
;
163-
}
164-
)
165-
;
166-
document
167-
.
168-
head
169-
.
170-
appendChild
171-
(
172-
script
173-
)
174-
;
175-
return
176-
promise
177-
;
178-
}
179-
)
18090
)
18191
;
18292
Status
@@ -217,12 +127,6 @@ kCancelled
217127
;
218128
}
219129
;
220-
const
221-
Status
222-
=
223-
{
224-
}
225-
;
226130
async
227131
function
228132
create_sms_provider
@@ -241,18 +145,43 @@ undefined
241145
'
242146
)
243147
{
148+
if
149+
(
150+
isChromiumBased
151+
)
152+
{
244153
await
245154
loadChromiumResources
246155
(
247156
)
248157
;
249158
}
159+
else
160+
{
161+
throw
162+
new
163+
Error
164+
(
165+
'
166+
Mojo
167+
testing
168+
interface
169+
is
170+
not
171+
available
172+
.
173+
'
174+
)
175+
;
176+
}
177+
}
250178
if
251179
(
252180
typeof
253181
SmsProvider
254182
=
255183
=
184+
=
256185
'
257186
undefined
258187
'
@@ -263,12 +192,11 @@ new
263192
Error
264193
(
265194
'
266-
Mojo
267-
testing
268-
interface
269-
is
270-
not
271-
available
195+
Failed
196+
to
197+
set
198+
up
199+
SmsProvider
272200
.
273201
'
274202
)

testing/web-platform/tests/credential-management/support/otpcredential-iframe.html

+19
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,27 @@
88
src
99
=
1010
"
11+
/
12+
resources
13+
/
14+
test
15+
-
16+
only
17+
-
18+
api
1119
.
20+
js
21+
"
22+
>
23+
<
1224
/
25+
script
26+
>
27+
<
28+
script
29+
src
30+
=
31+
"
1332
otpcredential
1433
-
1534
helper

0 commit comments

Comments
 (0)