diff --git a/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js b/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js index 7b6a7144dbb6..67871a2d4fd3 100644 --- a/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js +++ b/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js @@ -2,44 +2,29 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. const routerRules = { - 'condition-url-pattern-source-network': [ - { - condition: { - urlPattern: new URLPattern({ - pathname: '/**/direct.txt' - }) - }, - source: 'network' - }, - + 'condition-urlpattern-constructed-source-network': [{ + condition: {urlPattern: new URLPattern({pathname: '/**/direct.txt'})}, + source: 'network' + }], + 'condition-urlpattern-urlpatterninit-source-network': [ + {condition: {urlPattern: {pathname: '/**/direct.txt'}}, source: 'network'}, ], - 'condition-request-source-network': [ - { - condition: { - requestMode: 'no-cors' - }, - source: 'network' - } - ], - 'condition-or-source-network': [ - { - condition: { - or: [ - { - or: [ - { - urlPattern: '/**/or-test/direct1.*??*' - } - ], - }, - { - urlPattern: '/**/or-test/direct2.*??*' - } - ] - }, - source: 'network' - } + 'condition-urlpattern-string-source-network': [ + {condition: {urlPattern: '/**/direct.txt'}, source: 'network'}, ], + 'condition-request-source-network': + [{condition: {requestMode: 'no-cors'}, source: 'network'}], + 'condition-or-source-network': [{ + condition: { + or: [ + { + or: [{urlPattern: '/**/or-test/direct1.*??*'}], + }, + {urlPattern: '/**/or-test/direct2.*??*'} + ] + }, + source: 'network' + }], }; export {routerRules}; diff --git a/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html b/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html index dda75f20f4bc..523ececf317e 100644 --- a/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html +++ b/testing/web-platform/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html @@ -10,7 +10,7 @@ +