Use broccoli-test-builder and fix jshint failures

bustle · Jul 2, 2015 · 59d103c · 59d103c
1 parent af71d2d
commit 59d103c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 83 deletions.
diff --git a/Brocfile.js b/Brocfile.js
@@ -2,7 +2,7 @@
 
 var builder = require('broccoli-multi-builder');
 var mergeTrees = require('broccoli-merge-trees');
-var testTreeBuilder = require('./broccoli/test-tree-builder');
+var testTreeBuilder = require('broccoli-test-builder');
 
 var vendoredModules = [
     {name: 'content-kit-compiler', options: {libDirName: 'src'}},

diff --git a/broccoli/test-tree-builder.js b/broccoli/test-tree-builder.js
diff --git a/package.json b/package.json
@@ -29,11 +29,9 @@
   },
   "devDependencies": {
     "broccoli": "^0.16.3",
-    "broccoli-babel-transpiler": "^5.2.3",
-    "broccoli-concat": "0.0.13",
-    "broccoli-funnel": "^0.2.3",
     "broccoli-merge-trees": "^0.2.1",
-    "broccoli-multi-builder": "^0.2.2",
+    "broccoli-multi-builder": "^0.2.5",
+    "broccoli-test-builder": "^0.1.0",
     "content-kit-compiler": "^0.3.1",
     "content-kit-utils": "^0.2.0",
     "del": "^1.1.1",
@@ -48,8 +46,6 @@
     "gulp-open": "^0.2.8",
     "gulp-qunit": "^1.2.1",
     "gulp-uglify": "^1.1.0",
-    "loader.js": "^3.2.0",
-    "qunitjs": "^1.17.1",
     "testem": "^0.8.4"
   }
 }
diff --git a/src/js/utils/http-utils.js b/src/js/utils/http-utils.js
@@ -1,3 +1,4 @@
+/* global JSON */
 import win from '../utils/win';
 
 function createXHR(options) {

diff --git a/src/js/utils/selection-utils.js b/src/js/utils/selection-utils.js
@@ -3,6 +3,7 @@ import {
   Type,
   doc
 } from 'content-kit-compiler';
+import win from './win';
 
 // TODO: remove, pass in Editor's current block set
 var RootTags = [

diff --git a/src/js/views/toolbar.js b/src/js/views/toolbar.js
@@ -4,6 +4,7 @@ import { inherit } from 'content-kit-utils';
 import { tagsInSelection } from '../utils/selection-utils';
 import { createDiv, swapElements, positionElementToRightOf, positionElementCenteredAbove } from '../utils/element-utils';
 import { doc } from 'content-kit-compiler';
+import win from '../utils/win';
 
 var ToolbarDirection = {
   TOP   : 1,

diff --git a/tests/editor-test.js b/tests/editor-test.js
@@ -1,4 +1,4 @@
-/* global QUnit, test, asyncTest, ok, equal */
+/* global QUnit, test, asyncTest, ok, equal, expect, start */
 
 var fixture = document.getElementById('qunit-fixture');
 var editorElement = document.createElement('div');

diff --git a/tests/index.html b/tests/index.html
@@ -3,19 +3,19 @@
 <head>
   <meta charset="utf-8">
   <title>Content-Kit-Editor tests</title>
-  <link rel="stylesheet" href="./qunitjs/qunit/qunit.css">
+  <link rel="stylesheet" href="./qunit/qunit.css">
 </head>
 <body>
 
   <div id="qunit"></div>
   <div id="qunit-fixture"></div>
 
-  <script src="./qunitjs/qunit/qunit.js"></script>
+  <script src="./qunit/qunit.js"></script>
   <script src="/testem.js"></script>
   <script src="./loader.js/loader.js"></script>
   <script src="../amd/content-kit-editor.js"></script>
-  <script src="./content-kit-editor-tests.amd.js"></script>
-  <script src="./ember-cli-test-loader/test-loader.js"></script>
+  <script src="./built-amd-tests.js"></script>
+  <script src="./test-loader/test-loader.js"></script>
   <script>
     var TestLoader = require('ember-cli/test-loader')['default'];
     var testLoader = new TestLoader();