From e1760d64fb803cee22517a5b61eda94cdf3cb378 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sat, 1 May 2021 15:25:57 +0100
Subject: [PATCH] Tests: updates so latest libvips master branch passes

---
 src/common.cc         |  1 +
 test/unit/metadata.js | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/common.cc b/src/common.cc
index 353a6490..feef01da 100644
--- a/src/common.cc
+++ b/src/common.cc
@@ -235,6 +235,7 @@ namespace sharp {
     { "VipsForeignLoadFits", ImageType::FITS },
     { "VipsForeignLoadOpenexr", ImageType::EXR },
     { "VipsForeignLoadVips", ImageType::VIPS },
+    { "VipsForeignLoadVipsFile", ImageType::VIPS },
     { "VipsForeignLoadRaw", ImageType::RAW }
   };
 
diff --git a/test/unit/metadata.js b/test/unit/metadata.js
index 111b1d59..91b40bb7 100644
--- a/test/unit/metadata.js
+++ b/test/unit/metadata.js
@@ -240,40 +240,38 @@ describe('Image metadata', function () {
       })
   );
 
-  it('GIF via giflib', function (done) {
+  it('GIF', function (done) {
     sharp(fixtures.inputGif).metadata(function (err, metadata) {
       if (err) throw err;
       assert.strictEqual('gif', metadata.format);
       assert.strictEqual('undefined', typeof metadata.size);
       assert.strictEqual(800, metadata.width);
       assert.strictEqual(533, metadata.height);
-      assert.strictEqual(3, metadata.channels);
+      assert.strictEqual(true, [3, 4].includes(metadata.channels)); // libvips 8.11.0 = 4
       assert.strictEqual('uchar', metadata.depth);
       assert.strictEqual('undefined', typeof metadata.density);
       assert.strictEqual('undefined', typeof metadata.chromaSubsampling);
       assert.strictEqual(false, metadata.isProgressive);
       assert.strictEqual(false, metadata.hasProfile);
-      assert.strictEqual(false, metadata.hasAlpha);
       assert.strictEqual('undefined', typeof metadata.orientation);
       assert.strictEqual('undefined', typeof metadata.exif);
       assert.strictEqual('undefined', typeof metadata.icc);
       done();
     });
   });
-  it('GIF grey+alpha via giflib', function (done) {
+  it('GIF grey+alpha', function (done) {
     sharp(fixtures.inputGifGreyPlusAlpha).metadata(function (err, metadata) {
       if (err) throw err;
       assert.strictEqual('gif', metadata.format);
       assert.strictEqual('undefined', typeof metadata.size);
       assert.strictEqual(2, metadata.width);
       assert.strictEqual(1, metadata.height);
-      assert.strictEqual(2, metadata.channels);
+      assert.strictEqual(true, [2, 4].includes(metadata.channels)); // libvips 8.11.0 = 4
       assert.strictEqual('uchar', metadata.depth);
       assert.strictEqual('undefined', typeof metadata.density);
       assert.strictEqual('undefined', typeof metadata.chromaSubsampling);
       assert.strictEqual(false, metadata.isProgressive);
       assert.strictEqual(false, metadata.hasProfile);
-      assert.strictEqual(true, metadata.hasAlpha);
       assert.strictEqual('undefined', typeof metadata.orientation);
       assert.strictEqual('undefined', typeof metadata.exif);
       assert.strictEqual('undefined', typeof metadata.icc);
@@ -322,7 +320,7 @@ describe('Image metadata', function () {
         assert.strictEqual(isProgressive, false);
         assert.strictEqual(pages, 10);
         assert.strictEqual(pageHeight, 285);
-        assert.strictEqual(loop, 3);
+        assert.strictEqual(true, [2, 3].includes(loop)); // libvips 8.11.0 = 2
         assert.deepStrictEqual(delay, [...Array(9).fill(3000), 15000]);
         assert.strictEqual(hasProfile, false);
         assert.strictEqual(hasAlpha, true);