Merge branch 'master' into feature/TreeEnhancements

.circleci/config.yml

@@ -25,7 +25,7 @@ jobs:
           command: npm run cicoverage
       - run:
           name: browser
-          command: if [ "${CIRCLE_BRANCH}" != "master" ]; then npm run browser; fi;
+          command: if [ "${CIRCLE_BRANCH}" != "master" ]; then npm run browser || true; fi;
       - run:
           name: pre-danger
           command: git config user.email "drodriguez@smartprocure.us" && git config user.name "Decrapifier" && git config push.default upstream && git branch -u origin/$CIRCLE_BRANCH

.gitignore

@@ -41,3 +41,6 @@ lib
 
 # Package lock files
 package-lock.json
+
+# Browser test result file
+browser-results.json

CHANGELOG.md

@@ -1,7 +1,12 @@
 # 1.35.0
 - Add tree `treeLookup`
 - Add deep path support to `lensProp`
-- Ass `unsetOn`
+- Add `unsetOn`
+
+# 1.34.1
+- Ignore browser testing errors.
+- Add karma JSON reporter.
+- Only watch files and record videos/screenshots for the local test.
 
 # 1.34.0
 - Fixed flattenObject and diffArray to properly say the paths of

karma.conf.js

@@ -8,17 +8,21 @@ module.exports = function(config) {
 
   let browsers
   let reporters
+  let jsonReporter = {
+    stdout: false,
+    outputFile: 'browser-results.json', // defaults to none
+  }
 
   switch (process.env.TEST_ENV) {
     case 'browser':
       browsers = Object.keys(customLaunchers)
-      reporters = ['dots', 'saucelabs']
+      reporters = ['dots', 'json', 'saucelabs']
       break
     // default is local
     default:
       local = true
       browsers = ['Chrome']
-      reporters = ['progress']
+      reporters = ['progress', 'json']
   }
 
   config.set({
@@ -92,6 +96,8 @@ module.exports = function(config) {
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
     reporters: reporters,
+    // Write testing results to json file.
+    jsonReporter: jsonReporter,
 
     // web server port
     port: 9876,
@@ -104,15 +110,15 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
 
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
+    autoWatch: local,
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     // browsers: ['Chrome'],
     sauceLabs: {
       testName: 'Futil-js browser tests',
-      recordVideo: true,
-      recordScreenshots: true,
+      recordVideo: local,
+      recordScreenshots: local,
     },
     captureTimeout: 360 * 1000,
     browserNoActivityTimeout: 600 * 1000,

package.json

@@ -56,6 +56,7 @@
     "karma-chai": "^0.1.0",
     "karma-chai-as-promised": "^0.1.2",
     "karma-chrome-launcher": "^2.2.0",
+    "karma-json-reporter": "^1.2.1",
     "karma-mocha": "^1.3.0",
     "karma-sauce-launcher": "^1.2.0",
     "karma-sourcemap-loader": "^0.3.7",