Renew mocha version; rename some files, rename dir benchmarks -> benc…

…hmark.
uid11 · Sep 12, 2016 · 17b0147 · 17b0147
1 parent ac5db5e
commit 17b0147
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/benchmarks/browser-scaffold.js → benchmark/browser-scaffold.js b/benchmarks/browser-scaffold.js → benchmark/browser-scaffold.js
diff --git a/benchmarks/drain.js → benchmark/drain.js b/benchmarks/drain.js → benchmark/drain.js
diff --git a/benchmarks/index.html → benchmark/index.html b/benchmarks/index.html → benchmark/index.html
diff --git a/benchmarks/index.js → benchmark/index.js b/benchmarks/index.js → benchmark/index.js
diff --git a/benchmarks/scaffold.js → benchmark/scaffold.js b/benchmarks/scaffold.js → benchmark/scaffold.js
diff --git a/package.json b/package.json
@@ -1,17 +1,17 @@
 {
   "name": "next-task",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Implementation of nextTick (microtask queue) for all platforms (like asap.js).",
   "main": "src/next-task.js",
   "scripts": {
-    "test:browser": "./node_modules/opener/opener.js ./test/test.html && ./node_modules/opener/opener.js ./test/noPromise.html && ./node_modules/opener/opener.js ./test/noPromiseNoMutation.html",
-    "test:node": "./node_modules/mocha/bin/mocha",
-    "benchmark:browser": "./node_modules/opener/opener.js ./benchmarks/index.html",
-    "benchmark:node": "node benchmarks",
+    "test:browser": "./node_modules/opener/opener.js ./test/test.html && ./node_modules/opener/opener.js ./test/no-promise.html && ./node_modules/opener/opener.js ./test/no-promise-no-mutation.html",
+    "test:node": "./node_modules/mocha/bin/mocha ./test/test.js",
+    "benchmark:browser": "./node_modules/opener/opener.js ./benchmark/index.html",
+    "benchmark:node": "node benchmark",
     "build": "./node_modules/webpack/bin/webpack.js --display-modules -v"
   },
   "browser": {
-    "./benchmarks/scaffold.js": "./benchmarks/browser-scaffold.js"
+    "./benchmark/scaffold.js": "./benchmark/browser-scaffold.js"
   },
   "keywords": [
     "nextTick",
@@ -27,7 +27,7 @@
     "asap": "^2.0.0",
     "benchmark": "^2.0.0",
     "webpack": ">=1.0.0",
-    "mocha": "^2.0.0",
+    "mocha": "^3.0.0",
     "opener": "*",
     "lodash": "^4.15.0",
     "platform": "^1.3.1"

diff --git a/test/next-task.js → test/next-task-export.js b/test/next-task.js → test/next-task-export.js
diff --git a/test/noPromiseNoMutation.html → test/no-promise-no-mutation.html b/test/noPromiseNoMutation.html → test/no-promise-no-mutation.html
@@ -24,7 +24,7 @@
 <script src="../build/test.js"></script>
 
 <script>
-document.title = 'nextTask noPromise noMutation tests';
+document.title = 'nextTask no-promise no-mutation tests';
 
 mocha.run();
 </script>
diff --git a/test/noPromise.html → test/no-promise.html b/test/noPromise.html → test/no-promise.html
@@ -17,7 +17,7 @@
 <script src="../build/test.js"></script>
 
 <script>
-document.title = 'nextTask noPromise tests';
+document.title = 'nextTask no-promise tests';
 
 mocha.run();
 </script>
diff --git a/test/scaffold.js → test/scaffold-for-tests.js b/test/scaffold.js → test/scaffold-for-tests.js
diff --git a/test/test.js b/test/test.js
@@ -1,7 +1,7 @@
 'use strict'; /* global describe, it  */
 describe('nextTask', function() {
 
-var scaffold = require("./scaffold");
+var scaffold = require("./scaffold-for-tests");
 var nextTask = require("../src/next-task");
 
 var syncFlush = 0;

diff --git a/webpack.config.js b/webpack.config.js
@@ -6,8 +6,8 @@ module.exports = {
   context: __dirname,
   entry: {
     test: './test/test',
-    nextTask: './test/next-task',
-    benchmark: './benchmarks'
+    nextTask: './test/next-task-export',
+    benchmark: './benchmark'
   },
   output: {
     path: __dirname + '/build',