aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/karma.conf.common.js3
-rw-r--r--.config/karma.conf.js15
-rw-r--r--.config/karma.conf.saucelabs.js153
-rw-r--r--dist/svg.js2
-rw-r--r--package-lock.json32
-rw-r--r--package.json5
6 files changed, 115 insertions, 95 deletions
diff --git a/.config/karma.conf.common.js b/.config/karma.conf.common.js
index 1c791e7..5879546 100644
--- a/.config/karma.conf.common.js
+++ b/.config/karma.conf.common.js
@@ -47,7 +47,8 @@ module.exports = function (config) {
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
- logLevel: config.LOG_INFO,
+ // logLevel: config.LOG_INFO,
+ logLevel: config.LOG_DEBUG,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
diff --git a/.config/karma.conf.js b/.config/karma.conf.js
index 46068e5..57cf14f 100644
--- a/.config/karma.conf.js
+++ b/.config/karma.conf.js
@@ -20,15 +20,24 @@ if (process.platform === 'linux') {
module.exports = function (config) {
config.set(
Object.assign(karmaCommon(config), {
- // list of files to exclude
- exclude: [],
-
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'dist/svg.js': ['coverage']
},
+ // this specifies which plugins karma should load
+ // by default all karma plugins, starting with `karma-` will load
+ // so if you are really puzzled why something isn't working, then comment
+ // out plugins: [] - it's here to make karma load faster
+ // get possible karma plugins by `ls node_modules | grep 'karma-*'`
+ plugins: [
+ 'karma-chrome-launcher',
+ 'karma-coverage',
+ 'karma-firefox-launcher',
+ 'karma-jasmine',
+ ],
+
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
diff --git a/.config/karma.conf.saucelabs.js b/.config/karma.conf.saucelabs.js
index cfe869d..be52a55 100644
--- a/.config/karma.conf.saucelabs.js
+++ b/.config/karma.conf.saucelabs.js
@@ -1,6 +1,9 @@
// Karma configuration
// https://wiki.saucelabs.com/display/DOCS/Platform+Configurator
+// TODO: remove dotenv after local test
+// require('dotenv').config()
+
const karmaCommon = require('./karma.conf.common.js')
const SauceLabsLaunchers = {
@@ -16,7 +19,7 @@ const SauceLabsLaunchers = {
platformVersion: '6.0',
platformName: 'Android'
},*/
- sl_android: {
+ /* sl_android: {
base: 'SauceLabs',
browserName: 'Android',
deviceName: 'Android Emulator',
@@ -46,7 +49,7 @@ const SauceLabsLaunchers = {
recordVideo: true,
recordScreenshots: true,
screenResolution: '1024x768'
- }/*,
+ } *//*,
sl_macos_iphone: {
base: 'SauceLabs',
browserName: 'Safari',
@@ -54,7 +57,37 @@ const SauceLabsLaunchers = {
deviceOrientation: 'portrait',
platformVersion: '10.2',
platformName: 'iOS'
- }*/
+ }
+ 'SL_Chrome': {
+ base: 'SauceLabs',
+ browserName: 'chrome',
+ version: '48.0',
+ platform: 'Linux'
+ },
+ 'SL_Firefox': {
+ base: 'SauceLabs',
+ browserName: 'firefox',
+ version: '50.0',
+ platform: 'Windows 10'
+ },
+ 'SL_InternetExplorer': {
+ base: 'SauceLabs',
+ browserName: 'internet explorer',
+ version: '11.0',
+ platform: 'Windows 7'
+ },
+ 'SL_Safari': {
+ base: 'SauceLabs',
+ browserName: 'safari',
+ platform: 'OS X 10.11',
+ version: '10.0'
+ } */
+ 'SL_Chrome': {
+ base: 'SauceLabs',
+ browserName: 'chrome',
+ platform: 'Windows 10',
+ version: '70.0'
+ }
}
@@ -65,66 +98,58 @@ module.exports = function(config) {
console.warn("Aborting Sauce Labs test")
process.exit(1)
}
-
- config.set(
-
- Object.assign(karmaCommon, {
- // Concurrency level
- // how many browser should be started simultaneous
- // Saucelabs allow up to 5 concurrent sessions on the free open source tier.
- concurrency: 5,
-
- // this specifies which plugins karma should load
- // by default all karma plugins, starting with `karma-` will load
- // so if you are really puzzled why something isn't working, then comment
- // out plugins: [] - it's here to make karma load faster
- // get possible karma plugins by `ls node_modules | grep 'karma-*'`
- plugins: [
- 'karma-coverage',
- 'karma-jasmine',
- 'karma-sauce-launcher',
- 'karma-spec-reporter'
- ],
-
- // test results reporter to use
- // possible values: 'dots', 'progress'
- // available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['spec', 'saucelabs'],
-
- specReporter: {
- maxLogLines: 5, // limit number of lines logged per test
- suppressErrorSummary: false,// do print error summary
- suppressFailed: false, // do print information about failed tests
- suppressPassed: true, // do not print information about passed tests
- suppressSkipped: true, // do not print information about skipped tests
- showSpecTiming: true, // print the time elapsed for each spec
- failFast: false // test would finish with error when a first fail occurs.
- },
-
- customLaunchers: SauceLabsLaunchers,
-
- // start these browsers
- browsers: Object.keys(SauceLabsLaunchers),
- sauceLabs: {
- testName: 'SVG.js Unit Tests',
- connectOptions: {
- noSslBumpDomains: "all"
- }
- },
-
- // The number of disconnections tolerated.
- browserDisconnectTolerance: 0, // well, sometimes it helps to just restart
- // How long does Karma wait for a browser to reconnect (in ms).
- browserDisconnectTimeout: 10 * 60 * 1000,
- // How long will Karma wait for a message from a browser before disconnecting from it (in ms). ~ macOS 10.12 needs more than 7 minutes
- browserNoActivityTimeout: 20 * 60 * 1000,
- // Timeout for capturing a browser (in ms). On newer versions of iOS simulator (10.0+), the start up time could be between 3 - 6 minutes.
- captureTimeout: 12 * 60 * 1000, // this is useful if saucelabs takes a long time to boot a vm
-
- // Required to make Safari on Sauce Labs play nice.
- hostname: 'karmalocal.dev'
- })
-
- )
+ const settings = Object.assign(karmaCommon(config), {
+ // Concurrency level
+ // how many browser should be started simultaneous
+ // Saucelabs allow up to 5 concurrent sessions on the free open source tier.
+ concurrency: 5,
+
+ // this specifies which plugins karma should load
+ // by default all karma plugins, starting with `karma-` will load
+ // so if you are really puzzled why something isn't working, then comment
+ // out plugins: [] - it's here to make karma load faster
+ // get possible karma plugins by `ls node_modules | grep 'karma-*'`
+ plugins: [
+ 'karma-jasmine',
+ 'karma-sauce-launcher',
+ ],
+
+ logLevel: config.LOG_DEBUG,
+
+ // test results reporter to use
+ // possible values: 'dots', 'progress'
+ // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+ reporters: ['dots', 'saucelabs'],
+
+ customLaunchers: SauceLabsLaunchers,
+
+ // start these browsers
+ browsers: Object.keys(SauceLabsLaunchers),
+ sauceLabs: {
+ testName: 'SVG.js Unit Tests',
+ // connectOptions: {
+ // noSslBumpDomains: "all"
+ // },
+ // connectOptions: {
+ // port: 5757,
+ // logfile: 'sauce_connect.log'
+ // },
+ },
+
+ // The number of disconnections tolerated.
+ // browserDisconnectTolerance: 0, // well, sometimes it helps to just restart
+ // // How long does Karma wait for a browser to reconnect (in ms).
+ // browserDisconnectTimeout: 10 * 60 * 1000,
+ // // How long will Karma wait for a message from a browser before disconnecting from it (in ms). ~ macOS 10.12 needs more than 7 minutes
+ // browserNoActivityTimeout: 20 * 60 * 1000,
+ // // Timeout for capturing a browser (in ms). On newer versions of iOS simulator (10.0+), the start up time could be between 3 - 6 minutes.
+ // captureTimeout: 12 * 60 * 1000, // this is useful if saucelabs takes a long time to boot a vm
+
+ // // Required to make Safari on Sauce Labs play nice.
+ // // hostname: 'karmalocal.dev'
+ })
+
+ console.log(settings)
+ config.set(settings)
}
diff --git a/dist/svg.js b/dist/svg.js
index 77c3edc..884acaa 100644
--- a/dist/svg.js
+++ b/dist/svg.js
@@ -6,7 +6,7 @@
* @copyright Wout Fierens <wout@mick-wout.com>
* @license MIT
*
-* BUILT: Mon Nov 12 2018 00:35:39 GMT+0100 (CET)
+* BUILT: Mon Nov 12 2018 20:31:54 GMT+0100 (CET)
*/;
var SVG = (function () {
'use strict';
diff --git a/package-lock.json b/package-lock.json
index dc68528..fbba8e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2534,6 +2534,11 @@
"void-elements": "^2.0.0"
}
},
+ "dotenv": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz",
+ "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw=="
+ },
"duplexer": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -3667,8 +3672,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -3709,8 +3713,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -3720,8 +3723,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3838,8 +3840,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -3851,7 +3852,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3977,8 +3977,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -4111,7 +4110,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4131,7 +4129,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -5358,15 +5355,6 @@
"wd": "^1.4.0"
}
},
- "karma-spec-reporter": {
- "version": "0.0.32",
- "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.32.tgz",
- "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
- "dev": true,
- "requires": {
- "colors": "^1.1.2"
- }
- },
"kind-of": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
diff --git a/package.json b/package.json
index 00a14c5..941ddbd 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "^1.1.2",
"karma-sauce-launcher": "^1.2.0",
- "karma-spec-reporter": "0.0.32",
"rollup": "^0.67.0",
"rollup-plugin-babel": "^4.0.3",
"rollup-plugin-commonjs": "^9.2.0",
@@ -94,7 +93,5 @@
"rollup-plugin-uglify": "^6.0.0",
"rollup-plugin-uglify-es": "0.0.1",
"svgdom": "latest"
- },
- "dependencies": {},
- "optionalDependencies": {}
+ }
}