chore: Upgrade broccoli dependencies (#539)

use broccoli-livereload, remove broccoli-inject-livereload and tiny-lr
fix bad import in cursor-range-test

use pushResult instead of deprecated push for QUnit

Brocfile.js

@@ -1,69 +1,51 @@
 /* jshint node:true */
 
-var broccoli = require('broccoli');
-var Watcher = require('broccoli-sane-watcher');
-var Funnel = require('broccoli-funnel');
-var builder = require('broccoli-multi-builder');
-var mergeTrees = require('broccoli-merge-trees');
-var testTreeBuilder = require('broccoli-test-builder');
-var jquery = require('./broccoli/jquery');
-var injectLiveReload = require('broccoli-inject-livereload');
-var LiveReload = require('tiny-lr');
-var replace = require('broccoli-string-replace');
-var demoTree = require('./broccoli/demo');
+var broccoli = require("broccoli");
+var Watcher = require("broccoli-sane-watcher");
+var Funnel = require("broccoli-funnel");
+var builder = require("broccoli-multi-builder");
+var mergeTrees = require("broccoli-merge-trees");
+var testTreeBuilder = require("broccoli-test-builder");
+var jquery = require("./broccoli/jquery");
+var BroccoliLiveReload = require("broccoli-livereload");
+var replace = require("broccoli-string-replace");
+var demoTree = require("./broccoli/demo");
 
 var vendoredModules = [
-  { name: 'mobiledoc-dom-renderer' },
-  { name: 'mobiledoc-text-renderer' }
+  { name: "mobiledoc-dom-renderer" },
+  { name: "mobiledoc-text-renderer" }
 ];
 
-var cssFiles = new Funnel('src/css', {
-  destDir: 'css'
-});
+var cssFiles = new Funnel("src/css", { destDir: "css" });
 
-var packageName = require('./package.json').name;
+var packageName = require("./package.json").name;
 
 var buildOptions = {
-  libDirName: 'src/js',
+  libDirName: "src/js",
   vendoredModules: vendoredModules,
   packageName: packageName
 };
 
-var testTree = testTreeBuilder.build({libDirName: 'src'});
-testTree = jquery.build(testTree, '/tests/jquery');
+var testTree = testTreeBuilder.build({ libDirName: "src" });
+testTree = jquery.build(testTree, "/tests/jquery");
+testTree = new BroccoliLiveReload(testTree, { target: "index.html" });
 
 var testBuilder = new broccoli.Builder(testTree);
-var lrServer = new LiveReload.Server();
-lrServer.listen();
-var watcher = new Watcher(testBuilder);
-watcher.on('change', function() {
-  try {
-    lrServer.changed({
-      body: {
-        files: ['js/']
-      }
-    });
-  } catch(e) {
-    console.log('error notifying live-reload of change: ',e);
-  }
-});
 
 function replaceVersion(tree) {
-  var version = require('./package.json').version;
+  var version = require("./package.json").version;
   return replace(tree, {
-    files: ['**/*.js'],
-    pattern: {
-      match: /##VERSION##/g,
-      replacement: version
-    }
+    files: [ "**/*.js" ],
+    pattern: { match: /##VERSION##/g, replacement: version }
   });
 }
 
 module.exports = mergeTrees([
-  replaceVersion(builder.build('amd', buildOptions)),
-  replaceVersion(builder.build('global', buildOptions)),
-  replaceVersion(builder.build('commonjs', buildOptions)),
+  replaceVersion(builder.build("amd", buildOptions)),
+  replaceVersion(builder.build("global", buildOptions)),
+  replaceVersion(builder.build("commonjs", buildOptions)),
   cssFiles,
-  injectLiveReload(testTree),
+  testTree,
   demoTree()
 ]);
+

package.json

@@ -41,23 +41,22 @@
     "mobiledoc-text-renderer": "0.3.2"
   },
   "devDependencies": {
-    "broccoli": "^0.16.9",
+    "broccoli": "^1.1.1",
     "broccoli-babel-transpiler": "^5.6.1",
     "broccoli-cli": "^1.0.0",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-inject-livereload": "^0.2.0",
-    "broccoli-merge-trees": "^1.0.0",
-    "broccoli-multi-builder": "^0.2.8",
+    "broccoli-livereload": "^1.0.0",
+    "broccoli-merge-trees": "^2.0.0",
+    "broccoli-multi-builder": "^0.3.0",
     "broccoli-sane-watcher": "^1.1.4",
     "broccoli-string-replace": "^0.1.1",
-    "broccoli-test-builder": "^0.2.0",
+    "broccoli-test-builder": "^0.3.0",
     "conventional-changelog": "^1.1.0",
     "conventional-changelog-cli": "^1.2.0",
     "jquery": "^3.0.0",
     "jsdoc": "^3.4.2",
     "saucie": "1.4.1",
-    "testem": "^1.7.4",
-    "tiny-lr": "^1.0.2"
+    "testem": "^1.7.4"
   },
   "main": "dist/commonjs/mobiledoc-kit/index.js"
 }

tests/helpers/assertions.js

@@ -38,7 +38,12 @@ function comparePostNode(actual, expected, assert, path='root', deepCompare=fals
     return;
   }
   if (actual.type !== expected.type) {
-    assert.push(false, actual.type, expected.type, `wrong type at ${path}`);
+    assert.pushResult({
+      result: false,
+      actual: actual.type,
+      expected: expected.type,
+      message: `wrong type at ${path}`
+    });
   }
 
   switch (actual.type) {
@@ -124,14 +129,24 @@ export default function registerAssertions() {
   QUnit.assert.hasElement = function(selector,
                                      message=`hasElement "${selector}"`) {
     let found = $(selector);
-    this.push(found.length > 0, found.length, selector, message);
+    this.pushResult({
+      result: found.length > 0,
+      actual: found.length,
+      expected: selector,
+      message: message
+    });
     return found;
   };
 
   QUnit.assert.hasNoElement = function(selector,
                                        message=`hasNoElement "${selector}"`) {
     let found = $(selector);
-    this.push(found.length === 0, found.length, selector, message);
+    this.pushResult({
+      result: found.length === 0,
+      actual: found.length,
+      expected: selector,
+      message: message
+    });
     return found;
   };
 
@@ -157,10 +172,12 @@ export default function registerAssertions() {
 
   QUnit.assert.selectedText = function(text, message=`selectedText "${text}"`) {
     const selected = DOMHelper.getSelectedText();
-    this.push(selected === text,
-              selected,
-              text,
-              message);
+    this.pushResult({
+      result: selected === text,
+      actual: selected,
+      expected: text,
+      message: message
+    });
   };
 
   QUnit.assert.inArray = function(element, array,
@@ -216,15 +233,26 @@ export default function registerAssertions() {
   QUnit.assert.positionIsEqual = function(position, expected,
                                           message=`position is equal`) {
     if (position.section !== expected.section) {
-      this.push(false,
-                `${position.section.type}:${position.section.tagName}`,
-                `${expected.section.type}:${expected.section.tagName}`,
-               `incorrect position section (${message})`);
+      this.pushResult({
+        result: false,
+        actual: `${position.section.type}:${position.section.tagName}`,
+        expected: `${expected.section.type}:${expected.section.tagName}`,
+        message: `incorrect position section (${message})`
+      });
     } else if (position.offset !== expected.offset) {
-      this.push(false, position.offset, expected.offset,
-                `incorrect position offset (${message})`);
+      this.pushResult({
+        result: false,
+        actual: position.offset,
+        expected: expected.offset,
+        message: `incorrect position offset (${message})`
+      });
     } else {
-      this.push(true, position, expected, message);
+      this.pushResult({
+        result: true,
+        actual: position,
+        expected: expected,
+        message: message
+      });
     }
   };
 
@@ -242,32 +270,51 @@ export default function registerAssertions() {
 
     if (!head.isEqual(expectedHead)) {
       failed = true;
-      this.push(false,
-                `${head.section.type}:${head.section.tagName}`,
-                `${expectedHead.section.type}:${expectedHead.section.tagName}`,
-                'incorrect head position');
+      this.pushResult({
+        result: false,
+        actual: `${head.section.type}:${head.section.tagName}`,
+        expected: `${expectedHead.section.type}:${expectedHead.section.tagName}`,
+        message: 'incorrect head position'
+      });
     }
 
     if (!tail.isEqual(expectedTail)) {
       failed = true;
-      this.push(false,
-                `${tail.section.type}:${tail.section.tagName}`,
-                `${expectedTail.section.type}:${expectedTail.section.tagName}`,
-                'incorrect tail position');
+      this.pushResult({
+        result: false,
+        actual: `${tail.section.type}:${tail.section.tagName}`,
+        expected: `${expectedTail.section.type}:${expectedTail.section.tagName}`,
+        message: 'incorrect tail position'
+      });
     }
 
     if (isCollapsed !== expectedIsCollapsed) {
       failed = true;
-      this.push(false, isCollapsed, expectedIsCollapsed, 'wrong value for isCollapsed');
+      this.pushResult({
+        result: false,
+        actual: isCollapsed,
+        expected: expectedIsCollapsed,
+        message: 'wrong value for isCollapsed'
+      });
     }
 
     if (direction !== expectedDirection) {
       failed = true;
-      this.push(false, direction, expectedDirection, 'wrong value for direction');
+      this.pushResult({
+        result: false,
+        actual: direction,
+        expected: expectedDirection,
+        message: 'wrong value for direction'
+      });
     }
 
     if (!failed) {
-      this.push(true, range, expected, message);
+      this.pushResult({
+        result: true,
+        actual: range,
+        expected: expected,
+        message: message
+      });
     }
   };
 

tests/unit/utils/cursor-range-test.js

@@ -1,7 +1,7 @@
 import Helpers from '../../test-helpers';
 import Range from 'mobiledoc-kit/utils/cursor/range';
 import { DIRECTION } from 'mobiledoc-kit/utils/key';
-import { detect } from '../utils/array-utils';
+import { detect } from 'mobiledoc-kit/utils/array-utils';
 
 const { FORWARD, BACKWARD } = DIRECTION;
 const {module, test} = Helpers;