Fix bomb check

GoogleChrome · May 12, 2017 · cc44ef6 · cc44ef6
1 parent a994c11
commit cc44ef6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/lighthouse-core/gather/gatherers/manifest.js b/lighthouse-core/gather/gatherers/manifest.js
@@ -37,24 +37,20 @@ class Manifest extends Gatherer {
   afterPass(options) {
     return options.driver.getAppManifest()
       .then(response => {
+        const isBomEncoded = Buffer.from(response.data).slice(0, BOM_ENCODING.length)
+          .equals(new Buffer(BOM_ENCODING));
+        if (isBomEncoded) {
+          response.data = Buffer.from(response.data).slice(BOM_ENCODING.length).toString();
+        }
+
         return manifestParser(response.data, response.url, options.url);
       })
       .catch(err => {
         if (err === 'No web app manifest found.') {
           return null;
         }
 
-<<<<<<< HEAD
         return Promise.reject(err);
-=======
-        const isBomEncoded = Buffer.from(response.data).slice(1, 4)
-          .equals(new Buffer(BOM_ENCODING));
-        if (isBomEncoded) {
-          throw new Error('Manifest is encoded with BOM. Please remove the BOM encoding');
-        }
-
-        return manifestParser(response.data, response.url, options.url);
->>>>>>> Throw error when manifest is BOM encoding
       });
   }
 }

diff --git a/lighthouse-core/test/gather/gatherers/manifest-test.js b/lighthouse-core/test/gather/gatherers/manifest-test.js
@@ -57,9 +57,9 @@ describe('Manifest gatherer', () => {
     const getDriver = (data) => {
       return {
         driver: {
-          sendCommand() {
+          getAppManifest() {
             return Promise.resolve({
-              data: JSON.stringify(data),
+              data,
               errors: [],
               url: EXAMPLE_MANIFEST_URL
             });
@@ -72,8 +72,8 @@ describe('Manifest gatherer', () => {
     const promises = [];
     promises.push(manifestGather.afterPass(getDriver(manifestWithBOM))
       .then(
-        _ => assert.ok(false),
-        err => assert.ok(err.message.includes('Manifest is encoded with BOM.'))
+        _ => assert.ok(true),
+        _ => assert.ok(false)
       )
     );