Remove thenability from Cypress.Blob >= 5.0.0

abramenal · Aug 20, 2020 · efa9358 · efa9358
1 parent 45e3fc6
commit efa9358
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/lib/file/getFileBlobAsync.js b/lib/file/getFileBlobAsync.js
@@ -2,12 +2,24 @@ import { extname } from 'path';
 
 import { ENCODING, FILE_EXTENSION } from './constants';
 
+let wrapBlob = blob => {
+  // Cypress version 5 assigns a function with a compatibility warning
+  // to blob.then, but that makes the Blob actually thenable. We have
+  // to remove that to Promise.resolve not treat it as thenable.
+  //
+  // eslint-disable-next-line no-param-reassign
+  delete blob.then;
+  return Cypress.Promise.resolve(blob);
+};
+
+if (Cypress.version < '5.0.0') {
+  wrapBlob = blob => blob;
+}
+
 const ENCODING_TO_BLOB_GETTER = {
   [ENCODING.ASCII]: fileContent => Cypress.Promise.resolve(fileContent),
-  [ENCODING.BASE64]: (fileContent, mimeType) =>
-    Cypress.Promise.try(() => Cypress.Blob.base64StringToBlob(fileContent, mimeType)),
-  [ENCODING.BINARY]: (fileContent, mimeType) =>
-    Cypress.Promise.try(() => Cypress.Blob.binaryStringToBlob(fileContent, mimeType)),
+  [ENCODING.BASE64]: (fileContent, mimeType) => wrapBlob(Cypress.Blob.base64StringToBlob(fileContent, mimeType)),
+  [ENCODING.BINARY]: (fileContent, mimeType) => wrapBlob(Cypress.Blob.binaryStringToBlob(fileContent, mimeType)),
   [ENCODING.HEX]: fileContent => Cypress.Promise.resolve(fileContent),
   [ENCODING.LATIN1]: fileContent => Cypress.Promise.resolve(fileContent),
   [ENCODING.UTF8]: fileContent => Cypress.Promise.resolve(fileContent),