move mocha_tests/ to test/

55 files changed, 12 insertions, 12 deletions

diff --git a/.travis.yml b/.travis.yml
index ce9c990..d493d37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
   include:
     - node_js: "10"
       addons:
-        firefox: "57.0"
+        firefox: "60.0"
       env: BROWSER=true MAKE_TEST=true
 env:
   matrix: BROWSER=false MAKE_TEST=false
diff --git a/Makefile b/Makefile
index d3b00e9..a5a0422 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ JS_INDEX = lib/index.js
 SCRIPTS = ./support
 JS_SRC = $(shell find lib/ -type f -name '*.js') lib/index.js
 INDEX_SRC = $(shell find lib/ -type f -name '*.js' | grep -v 'index') $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js
-LINT_FILES = lib/ mocha_test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js
+LINT_FILES = lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js
 
 UMD_BUNDLE = $(BUILDDIR)/dist/async.js
 UMD_BUNDLE_MIN = $(BUILDDIR)/dist/async.min.js
diff --git a/bower.json b/bower.json
index 7dbeb14..390c650 100644
--- a/bower.json
+++ b/bower.json
@@ -4,7 +4,7 @@
   "ignore": [
     "bower_components",
     "lib",
-    "mocha_test",
+    "test",
     "node_modules",
     "perf",
     "support",
diff --git a/karma.conf.js b/karma.conf.js
index dd7d73a..20f85d3 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -1,7 +1,7 @@
 module.exports = function(config) {
     config.set({
         browsers: ['Firefox'],
-        files: ['mocha_test/*.js'],
+        files: ['test/*.js'],
         frameworks: ['browserify', 'mocha'],
         plugins: [
             'karma-browserify',
@@ -10,7 +10,7 @@ module.exports = function(config) {
             'karma-firefox-launcher'
         ],
         preprocessors: {
-            'mocha_test/*.js': ['browserify']
+            'test/*.js': ['browserify']
         },
         reporters: ['mocha'],
         singleRun: true,
diff --git a/mocha_test/mocha.opts b/mocha_test/mocha.opts
deleted file mode 100644
index f39ac0a..0000000
--- a/mocha_test/mocha.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---compilers js:babel-core/register
---recursive
---growl
---ui bdd
diff --git a/package.json b/package.json
index b6cfdde..8b6c274 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
     "coverage": "nyc npm run mocha-node-test -- --grep @nycinvalid --invert",
     "coveralls": "npm run coverage && nyc report --reporter=text-lcov | coveralls",
     "jsdoc": "jsdoc -c ./support/jsdoc/jsdoc.json && node support/jsdoc/jsdoc-fix-html.js",
-    "lint": "eslint lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js",
+    "lint": "eslint lib/ test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js",
     "mocha-browser-test": "karma start",
-    "mocha-node-test": "mocha mocha_test/ --compilers js:babel-core/register",
+    "mocha-node-test": "mocha",
     "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
     "test": "npm run lint && npm run mocha-node-test"
   },
@@ -72,7 +72,7 @@
   },
   "nyc": {
     "exclude": [
-      "mocha_test"
+      "test"
     ]
   }
 }
diff --git a/mocha_test/.jshintrc b/test/.jshintrc
index ea272bc..ea272bc 100644
--- a/mocha_test/.jshintrc
+++ b/test/.jshintrc
diff --git a/mocha_test/apply.js b/test/apply.js
index 18e5d12..18e5d12 100644
--- a/mocha_test/apply.js
+++ b/test/apply.js
diff --git a/mocha_test/applyEach.js b/test/applyEach.js
index ca5ada3..ca5ada3 100644
--- a/mocha_test/applyEach.js
+++ b/test/applyEach.js
diff --git a/mocha_test/asyncFunctions.js b/test/asyncFunctions.js
index 3b759e1..3b759e1 100644
--- a/mocha_test/asyncFunctions.js
+++ b/test/asyncFunctions.js
diff --git a/mocha_test/asyncify.js b/test/asyncify.js
index 112b8ad..112b8ad 100644
--- a/mocha_test/asyncify.js
+++ b/test/asyncify.js
diff --git a/mocha_test/auto.js b/test/auto.js
index 489dbea..489dbea 100644
--- a/mocha_test/auto.js
+++ b/test/auto.js
diff --git a/mocha_test/autoInject.js b/test/autoInject.js
index 9c2d1fb..9c2d1fb 100644
--- a/mocha_test/autoInject.js
+++ b/test/autoInject.js
diff --git a/mocha_test/cargo.js b/test/cargo.js
index 55e6e96..55e6e96 100644
--- a/mocha_test/cargo.js
+++ b/test/cargo.js
diff --git a/mocha_test/compose.js b/test/compose.js
index 5be9192..5be9192 100644
--- a/mocha_test/compose.js
+++ b/test/compose.js
diff --git a/mocha_test/concat.js b/test/concat.js
index f6b73b3..f6b73b3 100644
--- a/mocha_test/concat.js
+++ b/test/concat.js
diff --git a/mocha_test/consoleFunctions.js b/test/consoleFunctions.js
index 3c295c8..3c295c8 100644
--- a/mocha_test/consoleFunctions.js
+++ b/test/consoleFunctions.js
diff --git a/mocha_test/constant.js b/test/constant.js
index d76076c..d76076c 100644
--- a/mocha_test/constant.js
+++ b/test/constant.js
diff --git a/mocha_test/detect.js b/test/detect.js
index b1ebf24..b1ebf24 100644
--- a/mocha_test/detect.js
+++ b/test/detect.js
diff --git a/mocha_test/during.js b/test/during.js
index 13db8b3..13db8b3 100644
--- a/mocha_test/during.js
+++ b/test/during.js
diff --git a/mocha_test/each.js b/test/each.js
index 014e9df..014e9df 100644
--- a/mocha_test/each.js
+++ b/test/each.js
diff --git a/mocha_test/eachOf.js b/test/eachOf.js
index dd73c22..dd73c22 100644
--- a/mocha_test/eachOf.js
+++ b/test/eachOf.js
diff --git a/mocha_test/ensureAsync.js b/test/ensureAsync.js
index 89659e2..89659e2 100644
--- a/mocha_test/ensureAsync.js
+++ b/test/ensureAsync.js
diff --git a/mocha_test/es2017/asyncFunctions.js b/test/es2017/asyncFunctions.js
index 1a93f4f..1a93f4f 100644
--- a/mocha_test/es2017/asyncFunctions.js
+++ b/test/es2017/asyncFunctions.js
diff --git a/mocha_test/every.js b/test/every.js
index 39ae51c..39ae51c 100644
--- a/mocha_test/every.js
+++ b/test/every.js
diff --git a/mocha_test/filter.js b/test/filter.js
index a6cea2a..a6cea2a 100644
--- a/mocha_test/filter.js
+++ b/test/filter.js
diff --git a/mocha_test/forever.js b/test/forever.js
index e00a22d..e00a22d 100644
--- a/mocha_test/forever.js
+++ b/test/forever.js
diff --git a/mocha_test/groupBy.js b/test/groupBy.js
index d20f385..d20f385 100644
--- a/mocha_test/groupBy.js
+++ b/test/groupBy.js
diff --git a/mocha_test/linked_list.js b/test/linked_list.js
index ab4b223..ab4b223 100644
--- a/mocha_test/linked_list.js
+++ b/test/linked_list.js
diff --git a/mocha_test/map.js b/test/map.js
index c7f5030..c7f5030 100644
--- a/mocha_test/map.js
+++ b/test/map.js
diff --git a/mocha_test/mapValues.js b/test/mapValues.js
index 612feff..612feff 100644
--- a/mocha_test/mapValues.js
+++ b/test/mapValues.js
diff --git a/mocha_test/memoize.js b/test/memoize.js
index df800cf..df800cf 100644
--- a/mocha_test/memoize.js
+++ b/test/memoize.js
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 0000000..ac4c711
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1,4 @@
+--require babel-core/register
+--recursive
+--growl
+--ui bdd
diff --git a/mocha_test/nextTick.js b/test/nextTick.js
index e590d94..e590d94 100644
--- a/mocha_test/nextTick.js
+++ b/test/nextTick.js
diff --git a/mocha_test/parallel.js b/test/parallel.js
index 2b07822..2b07822 100644
--- a/mocha_test/parallel.js
+++ b/test/parallel.js
diff --git a/mocha_test/priorityQueue.js b/test/priorityQueue.js
index f71e665..f71e665 100644
--- a/mocha_test/priorityQueue.js
+++ b/test/priorityQueue.js
diff --git a/mocha_test/queue.js b/test/queue.js
index 4539c14..4539c14 100644
--- a/mocha_test/queue.js
+++ b/test/queue.js
diff --git a/mocha_test/race.js b/test/race.js
index d56205d..d56205d 100644
--- a/mocha_test/race.js
+++ b/test/race.js
diff --git a/mocha_test/reduce.js b/test/reduce.js
index f5dce59..f5dce59 100644
--- a/mocha_test/reduce.js
+++ b/test/reduce.js
diff --git a/mocha_test/retry.js b/test/retry.js
index 8a9f4da..8a9f4da 100644
--- a/mocha_test/retry.js
+++ b/test/retry.js
diff --git a/mocha_test/retryable.js b/test/retryable.js
index 48d9ee9..48d9ee9 100644
--- a/mocha_test/retryable.js
+++ b/test/retryable.js
diff --git a/mocha_test/seq.js b/test/seq.js
index 1f7cbfc..1f7cbfc 100644
--- a/mocha_test/seq.js
+++ b/test/seq.js
diff --git a/mocha_test/series.js b/test/series.js
index 7d737fa..7d737fa 100644
--- a/mocha_test/series.js
+++ b/test/series.js
diff --git a/mocha_test/setImmediate.js b/test/setImmediate.js
index 854111a..854111a 100644
--- a/mocha_test/setImmediate.js
+++ b/test/setImmediate.js
diff --git a/mocha_test/slice.js b/test/slice.js
index 7020526..7020526 100644
--- a/mocha_test/slice.js
+++ b/test/slice.js
diff --git a/mocha_test/some.js b/test/some.js
index 989fecb..989fecb 100644
--- a/mocha_test/some.js
+++ b/test/some.js
diff --git a/mocha_test/sortBy.js b/test/sortBy.js
index 1636276..1636276 100644
--- a/mocha_test/sortBy.js
+++ b/test/sortBy.js
diff --git a/mocha_test/support/get_function_object.js b/test/support/get_function_object.js
index 008fd8f..008fd8f 100644
--- a/mocha_test/support/get_function_object.js
+++ b/test/support/get_function_object.js
diff --git a/mocha_test/timeout.js b/test/timeout.js
index cd4a751..cd4a751 100644
--- a/mocha_test/timeout.js
+++ b/test/timeout.js
diff --git a/mocha_test/times.js b/test/times.js
index ad1dfcd..ad1dfcd 100644
--- a/mocha_test/times.js
+++ b/test/times.js
diff --git a/mocha_test/transform.js b/test/transform.js
index a02b54b..a02b54b 100644
--- a/mocha_test/transform.js
+++ b/test/transform.js
diff --git a/mocha_test/tryEach.js b/test/tryEach.js
index db884a5..db884a5 100644
--- a/mocha_test/tryEach.js
+++ b/test/tryEach.js
diff --git a/mocha_test/until.js b/test/until.js
index e98b184..e98b184 100644
--- a/mocha_test/until.js
+++ b/test/until.js
diff --git a/mocha_test/waterfall.js b/test/waterfall.js
index 78b11bb..78b11bb 100644
--- a/mocha_test/waterfall.js
+++ b/test/waterfall.js
diff --git a/mocha_test/whilst.js b/test/whilst.js
index e04c2b7..e04c2b7 100644
--- a/mocha_test/whilst.js
+++ b/test/whilst.js