Merge pull request #149 from chrisguttandin/master

papandreou · web-flow · commit 13e5f478eb49 · 2019-04-05T00:33:33.000+02:00
Update assetgraph to version 5
diff --git a/lib/index.js b/lib/index.js
@@ -732,17 +732,6 @@ async function hyperlink(
     );
   }
 
-  // Check Content-Type vs. incoming relation targetTypes:
-
-  for (const asset of ag.findAssets({ expectedTypes: { $exists: true } })) {
-    const incompatibleTypes = [...asset.expectedTypes].filter(
-      expectedType => !asset._isCompatibleWith(expectedType)
-    );
-    if (incompatibleTypes.length > 0) {
-      asset._warnIncompatibleTypes([...incompatibleTypes, asset.type]);
-    }
-  }
-
   // Check preconnects:
 
   const preconnectAssetsToCheck = ag.findAssets({
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   ],
   "homepage": "https://github.com/Munter/hyperlink",
   "dependencies": {
-    "assetgraph": "4.8.0",
+    "assetgraph": "^5.8.3",
     "async": "^2.6.0",
     "optimist": "^0.6.1",
     "pretty-bytes": "^4.0.2",
diff --git a/test/index.js b/test/index.js
@@ -139,113 +139,6 @@ describe('hyperlink', function() {
     });
   });
 
-  it('should complain if an asset loaded has an unexpected Content-Type', async function() {
-    httpception([
-      {
-        request: 'GET https://example.com/',
-        response: {
-          statusCode: 200,
-          headers: {
-            'Content-Type': 'text/html; charset=UTF-8'
-          },
-          body: `
-            <!DOCTYPE html>
-            <html>
-            <head>
-              <link rel="stylesheet" href="styles.css">
-            </head>
-            <body>
-            </body>
-            </html>
-          `
-        }
-      },
-      {
-        request: 'GET https://example.com/styles.css',
-        response: {
-          headers: {
-            'Content-Type': 'image/png'
-          },
-          body: 'div { color: maroon; }'
-        }
-      }
-    ]);
-
-    const t = new TapRender();
-    sinon.spy(t, 'push');
-    await hyperlink(
-      {
-        root: 'https://example.com/',
-        inputUrls: ['https://example.com/']
-      },
-      t
-    );
-
-    expect(t.close(), 'to satisfy', { fail: 1 });
-    expect(t.push, 'to have a call satisfying', () => {
-      t.push(null, {
-        ok: false,
-        operator: 'content-type-mismatch',
-        name: 'content-type-mismatch https://example.com/styles.css',
-        actual: 'Asset is used as both Css and Png',
-        at:
-          'https://example.com/ (5:44) <link rel="stylesheet" href="styles.css">'
-      });
-    });
-  });
-
-  it('should complain if an asset being HEADed has an unexpected Content-Type', async function() {
-    httpception([
-      {
-        request: 'GET https://example.com/',
-        response: {
-          statusCode: 200,
-          headers: {
-            'Content-Type': 'text/html; charset=UTF-8'
-          },
-          body: `
-            <!DOCTYPE html>
-            <html>
-            <head></head>
-            <body>
-              <img src="hey.png">
-            </body>
-            </html>
-          `
-        }
-      },
-      {
-        request: 'HEAD https://example.com/hey.png',
-        response: {
-          headers: {
-            'Content-Type': 'text/plain'
-          }
-        }
-      }
-    ]);
-
-    const t = new TapRender();
-    sinon.spy(t, 'push');
-    await hyperlink(
-      {
-        root: 'https://example.com/',
-        inputUrls: ['https://example.com/']
-      },
-      t
-    );
-
-    expect(t.close(), 'to satisfy', { fail: 1 });
-    expect(t.push, 'to have a call satisfying', () => {
-      t.push(null, {
-        ok: false,
-        operator: 'content-type-mismatch',
-        name: 'content-type-mismatch https://example.com/hey.png',
-        actual: 'Asset is used as both Image and Text',
-        at: 'https://example.com/ (6:25) <img src="hey.png">'
-      });
-    });
-  });
-
   it('should complain if an asset being HEADed has no Content-Type', async function() {
     httpception([
       {
