From 04352494a05eefca54d6a8655ecc9be4ea568403 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Fri, 9 Feb 2018 19:45:54 +0100
Subject: [PATCH 1/3] test: Remove unnecessary `file-exists` dependency

Change-Type: patch
---
 npm-shrinkwrap.json          |  5 -----
 package.json                 |  1 -
 tests/image-stream/tester.js | 14 +++++++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 30963d12..8e32971e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2512,11 +2512,6 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
       "dev": true
     },
-    "file-exists": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-1.0.0.tgz",
-      "dev": true
-    },
     "file-name": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/file-name/-/file-name-0.1.0.tgz",
diff --git a/package.json b/package.json
index c1f24d10..01e17ca4 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,6 @@
     "eslint-plugin-node": "6.0.0",
     "eslint-plugin-promise": "3.6.0",
     "eslint-plugin-standard": "3.0.1",
-    "file-exists": "1.0.0",
     "html-angular-validate": "0.1.9",
     "mocha": "3.2.0",
     "mochainon": "1.0.0",
diff --git a/tests/image-stream/tester.js b/tests/image-stream/tester.js
index c280116b..beb1e054 100644
--- a/tests/image-stream/tester.js
+++ b/tests/image-stream/tester.js
@@ -19,8 +19,7 @@
 const m = require('mochainon')
 const _ = require('lodash')
 const Bluebird = require('bluebird')
-const fileExists = require('file-exists')
-const fs = Bluebird.promisifyAll(require('fs'))
+const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const imageStream = require('../../lib/image-stream/index')
@@ -35,9 +34,14 @@ const doFilesContainTheSameData = (file1, file2) => {
 }
 
 const deleteIfExists = (file) => {
-  return Bluebird.try(function () {
-    if (fileExists(file)) {
-      return fs.unlinkAsync(file)
+  return Bluebird.try(() => {
+    try {
+      fs.accessSync(file)
+      fs.unlinkSync(file)
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        return Bluebird.reject(error)
+      }
     }
 
     return Bluebird.resolve()

From 0bc09defa7f347168d60d84c9476752be9c638ca Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Fri, 9 Feb 2018 19:49:56 +0100
Subject: [PATCH 2/3] chore(package): Remove unused dependency `trackjs`

---
 npm-shrinkwrap.json          | 4 ----
 package.json                 | 1 -
 tests/image-stream/tester.js | 6 +++---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 8e32971e..10b9e3b7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -6339,10 +6339,6 @@
       "resolved": "https://registry.npmjs.org/tracery/-/tracery-1.0.3.tgz",
       "dev": true
     },
-    "trackjs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/trackjs/-/trackjs-2.3.1.tgz"
-    },
     "traverse": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
diff --git a/package.json b/package.json
index 01e17ca4..f1f1646b 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
     "semver": "5.1.1",
     "speedometer": "1.0.0",
     "sudo-prompt": "8.0.0",
-    "trackjs": "2.3.1",
     "udif": "0.13.0",
     "unbzip2-stream": "github:resin-io-modules/unbzip2-stream#core-streams",
     "usb": "github:tessel/node-usb#1.3.0",
diff --git a/tests/image-stream/tester.js b/tests/image-stream/tester.js
index beb1e054..14eba877 100644
--- a/tests/image-stream/tester.js
+++ b/tests/image-stream/tester.js
@@ -34,17 +34,17 @@ const doFilesContainTheSameData = (file1, file2) => {
 }
 
 const deleteIfExists = (file) => {
-  return Bluebird.try(() => {
+  return new Bluebird((resolve, reject) => {
     try {
       fs.accessSync(file)
       fs.unlinkSync(file)
     } catch (error) {
       if (error.code !== 'ENOENT') {
-        return Bluebird.reject(error)
+        return reject(error)
       }
     }
 
-    return Bluebird.resolve()
+    resolve()
   })
 }
 

From ab026b1635e21fa416faa92b8bcfa0d1be5317b4 Mon Sep 17 00:00:00 2001
From: Jonas Hermsmeier <jhermsmeier@gmail.com>
Date: Mon, 12 Feb 2018 14:42:05 +0100
Subject: [PATCH 3/3] test(image-stream): Fix lint error in tester

---
 tests/image-stream/tester.js | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/tests/image-stream/tester.js b/tests/image-stream/tester.js
index 14eba877..f243d25e 100644
--- a/tests/image-stream/tester.js
+++ b/tests/image-stream/tester.js
@@ -19,7 +19,7 @@
 const m = require('mochainon')
 const _ = require('lodash')
 const Bluebird = require('bluebird')
-const fs = require('fs')
+const fs = Bluebird.promisifyAll(require('fs'))
 const os = require('os')
 const path = require('path')
 const imageStream = require('../../lib/image-stream/index')
@@ -33,21 +33,6 @@ const doFilesContainTheSameData = (file1, file2) => {
   })
 }
 
-const deleteIfExists = (file) => {
-  return new Bluebird((resolve, reject) => {
-    try {
-      fs.accessSync(file)
-      fs.unlinkSync(file)
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        return reject(error)
-      }
-    }
-
-    resolve()
-  })
-}
-
 exports.DEFAULT_IMAGE_TESTS_TIMEOUT = 20000
 
 exports.expectError = function (file, errorMessage, errorDetail) {
@@ -93,7 +78,8 @@ exports.extractFromFilePath = function (file, image) {
     }).then(function (areEqual) {
       m.chai.expect(areEqual).to.be.true
     }).finally(function () {
-      return deleteIfExists(output)
+      return fs.unlinkAsync(output)
+        .catch({ code: 'ENOENT' }, _.noop)
     })
   })
 }