diff --git a/.travis.yml b/.travis.yml index f153c1e..93e8a19 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false language: node_js +os: + - osx + - linux + dist: trusty @@ -21,22 +25,12 @@ addons: - xvfb - at-spi2-core -os: - - osx - - linux - -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip3 install click pyobjc-framework-Quartz; fi - install: - if [ $TRAVIS_OS_NAME = linux ]; then export CC="gcc-5"; fi - export DISPLAY=':99.0' - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - npm install - after_script: - (cd tests/_snapshots && ../../node_modules/.bin/now --public --token "$NOW_TOKEN") diff --git a/package-lock.json b/package-lock.json index cb842f1..8c58ff5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -307,7 +307,7 @@ }, "ansi-colors": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-0.2.0.tgz", + "resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-0.2.0.tgz", "integrity": "sha1-csMd4qDZoszQysMMyYI+6y9kNLU=", "dev": true, "requires": { @@ -2087,7 +2087,7 @@ }, "date-format": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-0.0.0.tgz", + "resolved": "http://registry.npmjs.org/date-format/-/date-format-0.0.0.tgz", "integrity": "sha1-CSBoY6sHDrRZrOpVQsvYVrEZZrM=", "dev": true }, @@ -4197,7 +4197,7 @@ }, "log-utils": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/log-utils/-/log-utils-0.2.1.tgz", + "resolved": "http://registry.npmjs.org/log-utils/-/log-utils-0.2.1.tgz", "integrity": "sha1-pMIXoN2aUFFdm5ICBgkas9TgMc8=", "dev": true, "requires": { @@ -4764,7 +4764,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -4773,7 +4773,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -4995,7 +4995,7 @@ }, "pako": { "version": "0.2.9", - "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "resolved": "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz", "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", "dev": true }, @@ -5175,7 +5175,7 @@ "dependencies": { "underscore": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", "dev": true } @@ -5199,7 +5199,7 @@ "dependencies": { "underscore": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", + "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz", "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=", "dev": true } @@ -5247,7 +5247,7 @@ }, "promise": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-6.0.0.tgz", + "resolved": "http://registry.npmjs.org/promise/-/promise-6.0.0.tgz", "integrity": "sha1-RWU43Ur90l3H0PUqUgHtJCt8EJ0=", "dev": true, "requires": { @@ -5322,11 +5322,12 @@ }, "dependencies": { "clone-deep": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.0.tgz", - "integrity": "sha512-aNJ5/7Bz2IYBb7nIj34TLGk78lBXpXUgV9qsLngtTvJ9+scsZNnlU0OX2S2N4ax/sUQt7sDBkXiGjGJEmNbXOQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { + "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", "shallow-clone": "^3.0.0" } @@ -6002,16 +6003,17 @@ "dev": true }, "screenshot-tester": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/screenshot-tester/-/screenshot-tester-0.3.0.tgz", - "integrity": "sha512-IuekbrA3D9S57gjDMWMAIpIOdMydBAFq5pmZt1TbYQFI3+LcdzGEY+dvji5ZlL4qke0TCiI2Vso5ZPP4czZO6w==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/screenshot-tester/-/screenshot-tester-0.3.2.tgz", + "integrity": "sha512-lNsrEQHsc7yILzsAPi3Cwq2WmGWV8B3HTRSvgq9wHvVLGDfuIPtXcCOvU+oCh64x1BaBsOgmsYTvKvBPetS56Q==", "dev": true, "requires": { "blink-diff": "^1.0.13", "chalk": "^2.4.1", "prompt-confirm": "^1.2.0", "request": "^2.87.0", - "request-promise-native": "^1.0.5" + "request-promise-native": "^1.0.5", + "rimraf": "^2.6.2" } }, "semver": { @@ -6275,7 +6277,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -6295,7 +6297,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -6384,7 +6386,7 @@ "dependencies": { "debug": { "version": "0.7.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz", + "resolved": "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz", "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=", "dev": true }, @@ -6396,7 +6398,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -6408,7 +6410,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true } diff --git a/package.json b/package.json index cc1d09f..e9ba67d 100755 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "now": "^11.1.11", "p-map": "^1.2.0", "rimraf": "^2.6.2", - "screenshot-tester": "^0.3.0", + "screenshot-tester": "^0.3.2", "tap-spec": "^5.0.0", "tape": "^4.9.0", "to-dot-case": "^1.0.0" diff --git a/tests/_snapshots/reference/darwin/core-api.js.png b/tests/_snapshots/reference/darwin/core-api.js.png index a5edd45..cd8ea38 100644 Binary files a/tests/_snapshots/reference/darwin/core-api.js.png and b/tests/_snapshots/reference/darwin/core-api.js.png differ diff --git a/tests/ui.js b/tests/ui.js index ef609be..e4d8849 100644 --- a/tests/ui.js +++ b/tests/ui.js @@ -17,7 +17,6 @@ function tapLogger(type, file, err) { break; case 'FAILED': case 'ERROR': - if (!isCI && file == 'core-api.js - "Test window"') { total++; passed++; @@ -37,6 +36,14 @@ function tapLogger(type, file, err) { passed++; console.log(`ok ${total} - ${file}`); break; + case 'PUSH': + if (err) { + console.error(`Sending report to: ${file} failed`); + console.error('\t', err); + } else { + console.log(`Sent report to: ${file}`); + } + break; } } @@ -63,6 +70,18 @@ test('ui', t => { .then(() => tester('example/node-pad.js', 'Node Pad')) .then(() => tester('example/text.js', 'textDrawArea Example')) .then(() => tester.generateHTML()) + .then(() => { + const PR_REPO = + process.env.TRAVIS_REPO_SLUG || process.env.APPVEYOR_REPO_NAME; + const PR_NUM = process.env.TRAVIS_PULL_REQUEST || + process.env.APPVEYOR_PULL_REQUEST_NUMBER; + const NODE_MAJOR = process.version.substr(1).split('.')[0]; + if (PR_REPO && Number(PR_NUM)) { + tester.pushToServer('https://sts.mischnic.ml', PR_REPO, PR_NUM, + !(NODE_MAJOR === '11' || NODE_MAJOR === '10'), + ' - Node ' + NODE_MAJOR); + } + }) .then(() => { test.getHarness()._results.count += total - start; test.getHarness()._results.pass += passed;