From 4599752d9d1ce2f0c50725c9b2b979ddd6c12584 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 15:38:38 +0000 Subject: [PATCH 1/3] chore(package): update spectron to version 8.0.0 Closes #1609 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be2e18de..ba90f28f 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "plist": "^3.0.1", "pngjs": "^3.0.0", "run-series": "^1.1.4", - "spectron": "^3.3.0", + "spectron": "^8.0.0", "standard": "*", "tape": "^4.9.1", "walk-sync": "^2.0.2" From 48340010b127ccad121fccbc4e9d78b2f34f0f5e Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2019 15:38:42 +0000 Subject: [PATCH 2/3] chore(package): update lockfile package-lock.json --- package-lock.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index fd2601eb..03df58c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2548,7 +2548,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -2611,13 +2611,13 @@ } }, "electron-chromedriver": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-1.8.0.tgz", - "integrity": "sha512-m1f3nle5MaGp94bcDTtMZZMMOgPO54+TXoPBlTbBSUjfINR5SJ46yQXLfuE79/qsFfJKslZB1UzWURDDFIRmpQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz", + "integrity": "sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==", "dev": true, "requires": { - "electron-download": "^4.1.0", - "extract-zip": "^1.6.5" + "electron-download": "^4.1.1", + "extract-zip": "^1.6.7" } }, "electron-download": { @@ -4040,7 +4040,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { @@ -7110,7 +7110,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true } @@ -8792,16 +8792,16 @@ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, "spectron": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/spectron/-/spectron-3.8.0.tgz", - "integrity": "sha512-fQ7gFp6UuEaONjXFLifLeIUI022pOsm3b+NFAm696r2umUkSZ9IbnEgHwrvBX+pJ3QUDyCEs5bPHUieYU7FvaQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/spectron/-/spectron-8.0.0.tgz", + "integrity": "sha512-MI9+lAamDnw7S0vKaxXjU3g5qaW5KANaFLc+Hgq+QmMCkQbZLt6ukFFGfalmwIuYrmq+yWQPCD4CXgt3VSHrLA==", "dev": true, "requires": { "dev-null": "^0.1.1", - "electron-chromedriver": "~1.8.0", - "request": "^2.81.0", + "electron-chromedriver": "^6.0.0", + "request": "^2.87.0", "split": "^1.0.0", - "webdriverio": "^4.8.0" + "webdriverio": "^4.13.0" } }, "speedometer": { From 619e5249ac7f9835b7a035ce2d986f912eac319b Mon Sep 17 00:00:00 2001 From: hicom150 Date: Sun, 18 Aug 2019 16:35:54 +0200 Subject: [PATCH 3/3] Fix integration test setup --- package-lock.json | 12 ++++++------ test/setup.js | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03df58c1..0807cedb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1355,9 +1355,9 @@ } }, "buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", - "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.0.tgz", + "integrity": "sha512-Xpgy0IwHK2N01ncykXTy6FpCWuM+CJSHoPVBLyNqyrWxsedpLvwsYUhf0ME3WRFNUhos0dMamz9cOS/xRDtU5g==", "dev": true, "requires": { "base64-js": "^1.0.2", @@ -1365,9 +1365,9 @@ }, "dependencies": { "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", "dev": true } } diff --git a/test/setup.js b/test/setup.js index 910d19fe..2111a383 100644 --- a/test/setup.js +++ b/test/setup.js @@ -28,10 +28,15 @@ module.exports = { // Returns a promise that resolves to a Spectron Application once the app has loaded. // Takes a Tape test. Makes some basic assertions to verify that the app loaded correctly. function createApp (t) { + const userDataDir = process.platform === 'win32' + ? path.join('C:\\Windows\\Temp', 'WebTorrentTest') + : path.join('/tmp', 'WebTorrentTest') + return new Application({ path: path.join(__dirname, '..', 'node_modules', '.bin', 'electron' + (process.platform === 'win32' ? '.cmd' : '')), args: ['-r', path.join(__dirname, 'mocks.js'), path.join(__dirname, '..')], + chromeDriverArgs: [`--user-data-dir=${userDataDir}`], env: { NODE_ENV: 'test' }, waitTimeout: 10e3 }) @@ -78,6 +83,12 @@ function endTest (app, t, err) { // Otherwise, create the reference screenshot: test/screenshots//.png function screenshotCreateOrCompare (app, t, name) { const ssDir = path.join(__dirname, 'screenshots', process.platform) + + // check that path exists otherwise create it + if (!fs.existsSync(ssDir)) { + fs.mkdirSync(ssDir) + } + const ssPath = path.join(ssDir, name + '.png') let ssBuf