fix(webkit): allow contenttype with charset in interception (#2108)

microsoft · May 5, 2020 · 33ebe66 · 33ebe66
1 parent 1c17929
commit 33ebe66
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/src/webkit/wkInterceptableRequest.ts b/src/webkit/wkInterceptableRequest.ts
@@ -77,16 +77,23 @@ export class WKInterceptableRequest implements network.RouteDelegate {
       for (const header of Object.keys(response.headers))
         responseHeaders[header.toLowerCase()] = String(response.headers[header]);
     }
-    if (response.contentType)
+    let mimeType = base64Encoded ? 'application/octet-stream' : 'text/plain';
+    if (response.contentType) {
       responseHeaders['content-type'] = response.contentType;
+      const index = response.contentType.indexOf(';');
+      if (index !== -1)
+        mimeType = response.contentType.substring(0, index).trimEnd();
+      else
+        mimeType = response.contentType.trim();
+    }
     if (responseBody && !('content-length' in responseHeaders))
       responseHeaders['content-length'] = String(Buffer.byteLength(responseBody));
 
     await this._session.send('Network.interceptWithResponse', {
       requestId: this._requestId,
       status: response.status || 200,
       statusText: network.STATUS_TEXTS[String(response.status || 200)],
-      mimeType: response.contentType || (base64Encoded ? 'application/octet-stream' : 'text/plain'),
+      mimeType,
       headers: responseHeaders,
       base64Encoded,
       content: responseBody

diff --git a/test/golden-chromium/mock-svg.png b/test/golden-chromium/mock-svg.png
diff --git a/test/golden-firefox/mock-svg.png b/test/golden-firefox/mock-svg.png
diff --git a/test/golden-webkit/mock-svg.png b/test/golden-webkit/mock-svg.png
diff --git a/test/interception.spec.js b/test/interception.spec.js
@@ -484,6 +484,23 @@ describe('Request.fulfill', function() {
     const img = await page.$('img');
     expect(await img.screenshot()).toBeGolden(golden('mock-binary-response.png'));
   });
+  it.skip(FFOX && !HEADLESS)('should allow mocking svg with charset', async({page, server, golden}) => {
+    // Firefox headful produces a different image.
+    await page.route('**/*', route => {
+      route.fulfill({
+        contentType: 'image/svg+xml ; charset=utf-8',
+        body: '<svg width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect x="10" y="10" width="30" height="30" stroke="black" fill="transparent" stroke-width="5"/></svg>'
+      });
+    });
+    await page.evaluate(PREFIX => {
+      const img = document.createElement('img');
+      img.src = PREFIX + '/does-not-exist.svg';
+      document.body.appendChild(img);
+      return new Promise((f, r) => { img.onload = f; img.onerror = r; });
+    }, server.PREFIX);
+    const img = await page.$('img');
+    expect(await img.screenshot()).toBeGolden(golden('mock-svg.png'));
+  });
   it('should work with file path', async({page, server, golden}) => {
     await page.route('**/*', route => route.fulfill({ contentType: 'shouldBeIgnored', path: path.join(__dirname, 'assets', 'pptr.png') }));
     await page.evaluate(PREFIX => {