Fix browser tests

wooorm · wooorm · commit 1e881d0e5985 · 2019-05-26T13:31:22.000+02:00
diff --git a/package.json b/package.json
@@ -28,7 +28,6 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^10.0.0",
     "babel-jest": "^23.4.2",
-    "bowser": "^2.0.0",
     "eslint": "^5.0.0",
     "eslint-config-airbnb-base": "^13.0.0",
     "eslint-plugin-import": "^2.0.0",
diff --git a/src/index.test.js b/src/index.test.js
@@ -1,4 +1,3 @@
-import bowser from 'bowser';
 import h from 'hastscript';
 
 import { serializeNodeToHtmlString } from './utils';
@@ -54,13 +53,14 @@ describe('hast-util-to-dom', () => {
         }],
       }],
     };
-    const htmlActual = serializeNodeToHtmlString(toDOM(tree));
-    let htmlExpected = '<!DOCTYPE html><html><head></head><body></body></html>';
-    if (!bowser.x) {
-      if (bowser.gecko) {
-        htmlExpected = '<!DOCTYPE html>\n<html><head></head><body></body></html>';
-      }
+    const doctype = '<!DOCTYPE html>';
+    const htmlExpected = `${doctype}<html><head></head><body></body></html>`;
+    let htmlActual = serializeNodeToHtmlString(toDOM(tree));
+
+    if (htmlActual.charAt(doctype.length) === '\n') {
+      htmlActual = htmlActual.slice(0, doctype.length) + htmlActual.slice(doctype.length + 1);
     }
+
     expect(htmlActual).toEqual(htmlExpected);
   });
 
@@ -100,16 +100,15 @@ describe('hast-util-to-dom', () => {
       disabled: true,
       value: 'foo',
     });
-    const htmlActual = serializeNodeToHtmlString(toDOM(tree));
-    let htmlExpected = '<input disabled="" value="foo">';
-    // Specific non-JSDOM environments
-    if (!bowser.x) {
-      if (bowser.webkit || bowser.blink) {
-        htmlExpected = '<input disabled="" value="foo" />';
-      } else if (bowser.gecko) {
-        htmlExpected = '<input disabled="disabled" value="foo" />';
-      }
+    const htmlExpected = '<input disabled="disabled" value="foo">';
+    let htmlActual = serializeNodeToHtmlString(toDOM(tree));
+
+    htmlActual = htmlActual.replace(/disabled=""/, 'disabled="disabled"');
+
+    if (htmlActual.slice(-3) === ' />') {
+      htmlActual = `${htmlActual.slice(0, -3)}>`;
     }
+
     expect(htmlActual).toEqual(htmlExpected);
   });
 
@@ -123,13 +122,13 @@ describe('hast-util-to-dom', () => {
   it('handles comma-separated attributes correctly', () => {
     const img = 'data:image/gif;base64,R0lGODlhAQABAAAAACwAAAAAAQABAAA=';
     const tree = h('img', { srcSet: [`${img} 1x`, `${img} 2x`] });
-    const htmlActual = serializeNodeToHtmlString(toDOM(tree));
-    let htmlExpected = `<img srcset="${img} 1x, ${img} 2x">`;
-    if (!bowser.x) {
-      if (bowser.webkit || bowser.blink || bowser.gecko) {
-        htmlExpected = `<img srcset="${img} 1x, ${img} 2x" />`;
-      }
+    const htmlExpected = `<img srcset="${img} 1x, ${img} 2x">`;
+    let htmlActual = serializeNodeToHtmlString(toDOM(tree));
+
+    if (htmlActual.slice(-3) === ' />') {
+      htmlActual = `${htmlActual.slice(0, -3)}>`;
     }
+
     expect(htmlActual).toEqual(htmlExpected);
   });
 
diff --git a/yarn.lock b/yarn.lock
@@ -1371,11 +1371,6 @@ body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
-bowser@^2.0.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.4.0.tgz#fcfbca3d7659ba88afabbb8a45b33d2e4876a90c"
-  integrity sha512-DA9Opnb8S8TBLPPszrHDtCCATbAMkrxF+AxPs/d95r99frBioGpNwL1cbG3AHeV3FnoZW655vEvEryBHFeGrMg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
