Skip to content

Commit c7dec2f

Browse files
committed
test: update expectations for firefox 129
1 parent e8cf88a commit c7dec2f

File tree

5 files changed

+7
-25
lines changed

5 files changed

+7
-25
lines changed

tap/cookbook.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import jweVectors from '../cookbook/jwe.mjs'
99

1010
// https://bugs.webkit.org/show_bug.cgi?id=262499
1111
// https://github.com/web-platform-tests/wpt/pull/42292
12-
if (env.isWebKitAbove17) {
12+
if (env.isWebKit) {
1313
// @ts-ignore
1414
const ed25519 = jwsVectors.find((vector) => vector.title.includes('Ed25519'))
1515
ed25519.reproducible = false
@@ -42,7 +42,7 @@ export default (QUnit: QUnit, lib: typeof jose, keys: typeof jose) => {
4242
return !env.isDeno
4343
}
4444
if (vector.input.alg === 'EdDSA') {
45-
return env.isWebKitAbove17 || !env.isBrowser
45+
return !env.isBlink
4646
}
4747
return true
4848
}

tap/env.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@ async function isEngine(engine: string) {
3333
return userAgentData.engine.name === engine
3434
}
3535

36-
async function isVersionAtLeast(version: number) {
37-
const userAgentData = await parseUserAgent()
38-
return parseInt(userAgentData.browser.version.split('.')[0], 10) >= version
39-
}
40-
4136
export const isBlink = isBrowser && (await isEngine('Blink'))
4237

4338
export const isWebKit = isBrowser && (await isEngine('WebKit'))
44-
export const isWebKitAbove17 = isBrowser && isWebKit && (await isVersionAtLeast(17))
4539

4640
export const isGecko = isBrowser && (await isEngine('Gecko'))

tap/jwk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default (QUnit: QUnit, lib: typeof jose, keys: typeof jose) => {
1919
env.isDeno,
2020
],
2121
['ECDH-ES', KEYS.X448.jwk, env.isNode || env.isEdgeRuntime],
22-
['EdDSA', KEYS.Ed25519.jwk, (env.isWebKit && env.isWebKitAbove17) || !env.isBrowser],
22+
['EdDSA', KEYS.Ed25519.jwk, !env.isBlink],
2323
['EdDSA', KEYS.Ed448.jwk, env.isNode || env.isEdgeRuntime],
2424
['ES256', KEYS.P256.jwk, true],
2525
['ES256K', KEYS.secp256k1.jwk, lib.cryptoRuntime === 'node:crypto' && !env.isElectron],

tap/jws.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default (QUnit: QUnit, lib: typeof jose, keys: typeof jose) => {
99

1010
type Vector = [string, boolean] | [string, boolean, jose.GenerateKeyPairOptions]
1111
const algorithms: Vector[] = [
12-
['EdDSA', (env.isWebKit && env.isWebKitAbove17) || !env.isBrowser],
12+
['EdDSA', !env.isBlink],
1313
['EdDSA', env.isNode || env.isEdgeRuntime, { crv: 'Ed448' }],
1414
['ES256', true],
1515
[

tap/pem.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,9 @@ export default (QUnit: QUnit, lib: typeof jose, keys: typeof jose) => {
7676
],
7777
[['ECDH-ES', 'X448'], KEYS.X448.pkcs8, env.isNode || env.isEdgeRuntime],
7878
[['ECDH-ES', 'X448'], KEYS.X448.spki, env.isNode || env.isEdgeRuntime],
79-
[
80-
['EdDSA', 'Ed25519'],
81-
KEYS.Ed25519.pkcs8,
82-
(env.isWebKit && env.isWebKitAbove17) || !env.isBrowser,
83-
],
84-
[
85-
['EdDSA', 'Ed25519'],
86-
KEYS.Ed25519.spki,
87-
(env.isWebKit && env.isWebKitAbove17) || !env.isBrowser,
88-
],
89-
[
90-
['EdDSA', 'Ed25519'],
91-
KEYS.Ed25519.x509,
92-
(env.isWebKit && env.isWebKitAbove17) || !env.isBrowser,
93-
],
79+
[['EdDSA', 'Ed25519'], KEYS.Ed25519.pkcs8, !env.isBlink],
80+
[['EdDSA', 'Ed25519'], KEYS.Ed25519.spki, !env.isBlink],
81+
[['EdDSA', 'Ed25519'], KEYS.Ed25519.x509, !env.isBlink],
9482
[['EdDSA', 'Ed448'], KEYS.Ed448.pkcs8, env.isNode || env.isEdgeRuntime],
9583
[['EdDSA', 'Ed448'], KEYS.Ed448.spki, env.isNode || env.isEdgeRuntime],
9684
[['EdDSA', 'Ed448'], KEYS.Ed448.x509, env.isNode || env.isEdgeRuntime],

0 commit comments

Comments
 (0)