From 7621663dfe0ecae7845358031aad27134c5bd96c Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Sat, 25 Nov 2017 16:03:14 +0100 Subject: [PATCH] chore: fix testSingle --- .babelrc | 4 +- karma.conf.js | 8 +++- package-lock.json | 112 ++++++---------------------------------------- package.json | 4 +- 4 files changed, 24 insertions(+), 104 deletions(-) diff --git a/.babelrc b/.babelrc index 45e5d40665..24d282dea4 100644 --- a/.babelrc +++ b/.babelrc @@ -3,8 +3,8 @@ "latest" ], "ignore":[ - "bower_components/**/*.js", - "/bower_components/" + "node_modules", + "app-src/bower_components" ], "plugins": [ "angularjs-annotate" diff --git a/karma.conf.js b/karma.conf.js index ad4e4d51af..bd70831a93 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -7,6 +7,9 @@ module.exports = function(config) { basePath: '', reportSlowerThan: 500, + transports: ['polling'], + browserDisconnectTolerance: 2, + browserNoActivityTimeout: 50000, // frameworks to use // available frameworks: https://npmjs.org/browse/keyword/karma-adapter @@ -42,7 +45,10 @@ module.exports = function(config) { // all the rest of the files 'app-src/scripts/**/*.js', // load html as well as required for karma-ng-html2js-preprocessor - 'app-src/scripts/**/*.html' + 'app-src/scripts/**/*.html', + + // exclude unit tests here + { pattern: 'app-src/scripts/**/*.spec.js', included: false } ], // list of files to exclude diff --git a/package-lock.json b/package-lock.json index 2333864b5d..5966cc4f19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1774,30 +1774,6 @@ "readable-stream": "2.3.3" } }, - "build": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/build/-/build-0.1.4.tgz", - "integrity": "sha1-cH/gJv/O3crL/c3zVur9pk8VEEY=", - "requires": { - "cssmin": "0.3.2", - "jsmin": "1.0.1", - "jxLoader": "0.1.1", - "moo-server": "1.3.0", - "promised-io": "0.3.5", - "timespan": "2.3.0", - "uglify-js": "1.3.5", - "walker": "1.0.7", - "winston": "0.8.3", - "wrench": "1.3.9" - }, - "dependencies": { - "uglify-js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.3.5.tgz", - "integrity": "sha1-S1v/+Rhu/7qoiOTJ6UvZ/EyUkp0=" - } - } - }, "builder-util": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-3.4.1.tgz", @@ -2536,11 +2512,6 @@ "dev": true, "optional": true }, - "cssmin": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.3.2.tgz", - "integrity": "sha1-3c5MVHtRCuDVlKjx+/iq+OLFwA0=" - }, "csso": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz", @@ -2580,7 +2551,8 @@ "cycle": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=" + "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", + "dev": true }, "d": { "version": "0.1.1", @@ -4723,7 +4695,8 @@ "eyes": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" + "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", + "dev": true }, "fancy-log": { "version": "1.3.0", @@ -7953,11 +7926,6 @@ "text-table": "0.2.0" } }, - "jsmin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/jsmin/-/jsmin-1.0.1.tgz", - "integrity": "sha1-570NzWSWw79IYyNb9GGj2YqjuYw=" - }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -8089,24 +8057,6 @@ "integrity": "sha512-mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g==", "dev": true }, - "jxLoader": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jxLoader/-/jxLoader-0.1.1.tgz", - "integrity": "sha1-ATTqUUTlM7WU/B/yX/GU4jXFPs0=", - "requires": { - "js-yaml": "0.3.7", - "moo-server": "1.3.0", - "promised-io": "0.3.5", - "walker": "1.0.7" - }, - "dependencies": { - "js-yaml": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz", - "integrity": "sha1-1znY7oZGHlSzVNan19HyrZoWf2I=" - } - } - }, "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", @@ -9223,14 +9173,6 @@ "make-error": "1.3.0" } }, - "makeerror": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", - "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", - "requires": { - "tmpl": "1.0.4" - } - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -9508,11 +9450,6 @@ "resolved": "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-1.3.0.tgz", "integrity": "sha1-VBdxtfh6BJzGVUBHXTrZZnN9aQg=" }, - "moo-server": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/moo-server/-/moo-server-1.3.0.tgz", - "integrity": "sha1-XceVaVZaENbv7VQ5SR5p0jkuWPE=" - }, "mout": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mout/-/mout-1.1.0.tgz", @@ -10869,11 +10806,6 @@ "through2": "0.2.3" } }, - "promised-io": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/promised-io/-/promised-io-0.3.5.tgz", - "integrity": "sha1-StIXuzZYvKrplGsXqGaOzYUeE1Y=" - }, "prompt": { "version": "0.2.14", "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz", @@ -12321,7 +12253,8 @@ "stack-trace": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true }, "stat-mode": { "version": "0.2.2", @@ -12881,11 +12814,6 @@ } } }, - "timespan": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz", - "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=" - }, "tmp": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", @@ -12895,11 +12823,6 @@ "os-tmpdir": "1.0.2" } }, - "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" - }, "to-absolute-glob": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", @@ -13709,14 +13632,6 @@ "vow": "0.4.17" } }, - "walker": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", - "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", - "requires": { - "makeerror": "1.0.11" - } - }, "ware": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz", @@ -13848,6 +13763,7 @@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz", "integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=", + "dev": true, "requires": { "async": "0.2.10", "colors": "0.6.2", @@ -13861,17 +13777,20 @@ "async": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", - "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true }, "colors": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=", + "dev": true }, "pkginfo": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz", - "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=" + "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=", + "dev": true } } }, @@ -13957,11 +13876,6 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "wrench": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz", - "integrity": "sha1-bxPsNRRTF+spLKX2UxORskQRFBE=" - }, "write-file-atomic": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", diff --git a/package.json b/package.json index 3cf4eae03a..767e3fa446 100644 --- a/package.json +++ b/package.json @@ -110,12 +110,12 @@ "karma-babel-preprocessor": "^7.0.0", "karma-jasmine": "latest", "karma-ng-html2js-preprocessor": "latest", - "karma-phantomjs-launcher": "latest", + "karma-phantomjs-launcher": "^1.0.4", + "karma-chrome-launcher": "^2.2.0", "karma-sinon": "^1.0.5", "lazypipe": "latest", "merge-stream": "latest", "node-sass": "latest", - "phantomjs-prebuilt": "latest", "protractor": "latest", "require-dir": "latest", "run-sequence": "latest",