Skip to content

Commit 4d62e75

Browse files
committed
CORS test works with WebKit
1 parent ec673a7 commit 4d62e75

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/Http.test.e2e.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function getCorsErrorMessage(browserEngine: string | undefined) {
8686
message = 'NetworkError when attempting to fetch resource.';
8787
break;
8888
case 'WebKit':
89-
message = 'Origin null is not allowed by Access-Control-Allow-Origin.';
89+
message = 'Load failed';
9090
break;
9191
default:
9292
}
@@ -106,13 +106,9 @@ test('CORS fail', async ({ page }) => {
106106
const userAgent = await page.evaluate(() => window.navigator.userAgent);
107107
const browserEngine = new UAParser(userAgent).getEngine().name;
108108

109-
// FIXME Does not work with WebKit and Playwright 1.13.1
110-
if (browserEngine !== 'WebKit') {
111-
// eslint-disable-next-line jest/no-conditional-expect
112-
await expect(page.evaluate(url => window.Http.get(url).text(), url)).rejects.toThrow(
113-
getCorsErrorMessage(browserEngine)
114-
);
115-
}
109+
await expect(page.evaluate(url => window.Http.get(url).text(), url)).rejects.toThrow(
110+
getCorsErrorMessage(browserEngine)
111+
);
116112

117113
await server.close();
118114
});
@@ -163,7 +159,7 @@ test('abort request', async ({ page }) => {
163159
test('HTTPS + HTTP/2', async ({ page }) => {
164160
const userAgent = await page.evaluate(() => window.navigator.userAgent);
165161
const browserEngine = new UAParser(userAgent).getEngine().name;
166-
// FIXME Does not work with WebKit and Playwright 1.13.1
162+
// FIXME Does not work with WebKit and GitHub Actions
167163
if (browserEngine === 'WebKit') return;
168164

169165
const server = createTestServer({ https: true, http2: true });

src/Http.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ test('cannot connect', async () => {
473473
consoleSpy.mockRestore();
474474
});
475475

476-
// FIXME Remove when support for [EdgeHTML](https://en.wikipedia.org/wiki/EdgeHTML) will be dropped
476+
// FIXME Remove when support for [EdgeHTML](https://en.wikipedia.org/wiki/EdgeHTML) is dropped
477477
test('should not throw under EdgeHTML', async () => {
478478
const OriginalHeaders = Headers;
479479

0 commit comments

Comments
 (0)