move mocha_tests/ to test/

caolan · Jun 3, 2018 · bd86f42 · bd86f42
1 parent b149f7d
commit bd86f42
Show file tree

Hide file tree

Showing 55 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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 → test/.jshintrc b/mocha_test/.jshintrc → test/.jshintrc
diff --git a/mocha_test/apply.js → test/apply.js b/mocha_test/apply.js → test/apply.js
diff --git a/mocha_test/applyEach.js → test/applyEach.js b/mocha_test/applyEach.js → test/applyEach.js
diff --git a/mocha_test/asyncFunctions.js → test/asyncFunctions.js b/mocha_test/asyncFunctions.js → test/asyncFunctions.js
diff --git a/mocha_test/asyncify.js → test/asyncify.js b/mocha_test/asyncify.js → test/asyncify.js
diff --git a/mocha_test/auto.js → test/auto.js b/mocha_test/auto.js → test/auto.js
diff --git a/mocha_test/autoInject.js → test/autoInject.js b/mocha_test/autoInject.js → test/autoInject.js
diff --git a/mocha_test/cargo.js → test/cargo.js b/mocha_test/cargo.js → test/cargo.js
diff --git a/mocha_test/compose.js → test/compose.js b/mocha_test/compose.js → test/compose.js
diff --git a/mocha_test/concat.js → test/concat.js b/mocha_test/concat.js → test/concat.js
diff --git a/mocha_test/consoleFunctions.js → test/consoleFunctions.js b/mocha_test/consoleFunctions.js → test/consoleFunctions.js
diff --git a/mocha_test/constant.js → test/constant.js b/mocha_test/constant.js → test/constant.js
diff --git a/mocha_test/detect.js → test/detect.js b/mocha_test/detect.js → test/detect.js
diff --git a/mocha_test/during.js → test/during.js b/mocha_test/during.js → test/during.js
diff --git a/mocha_test/each.js → test/each.js b/mocha_test/each.js → test/each.js
diff --git a/mocha_test/eachOf.js → test/eachOf.js b/mocha_test/eachOf.js → test/eachOf.js
diff --git a/mocha_test/ensureAsync.js → test/ensureAsync.js b/mocha_test/ensureAsync.js → test/ensureAsync.js
diff --git a/mocha_test/es2017/asyncFunctions.js → test/es2017/asyncFunctions.js b/mocha_test/es2017/asyncFunctions.js → test/es2017/asyncFunctions.js
diff --git a/mocha_test/every.js → test/every.js b/mocha_test/every.js → test/every.js
diff --git a/mocha_test/filter.js → test/filter.js b/mocha_test/filter.js → test/filter.js
diff --git a/mocha_test/forever.js → test/forever.js b/mocha_test/forever.js → test/forever.js
diff --git a/mocha_test/groupBy.js → test/groupBy.js b/mocha_test/groupBy.js → test/groupBy.js
diff --git a/mocha_test/linked_list.js → test/linked_list.js b/mocha_test/linked_list.js → test/linked_list.js
diff --git a/mocha_test/map.js → test/map.js b/mocha_test/map.js → test/map.js
diff --git a/mocha_test/mapValues.js → test/mapValues.js b/mocha_test/mapValues.js → test/mapValues.js
diff --git a/mocha_test/memoize.js → test/memoize.js b/mocha_test/memoize.js → test/memoize.js
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -0,0 +1,4 @@
+--require babel-core/register
+--recursive
+--growl
+--ui bdd
diff --git a/mocha_test/nextTick.js → test/nextTick.js b/mocha_test/nextTick.js → test/nextTick.js
diff --git a/mocha_test/parallel.js → test/parallel.js b/mocha_test/parallel.js → test/parallel.js
diff --git a/mocha_test/priorityQueue.js → test/priorityQueue.js b/mocha_test/priorityQueue.js → test/priorityQueue.js
diff --git a/mocha_test/queue.js → test/queue.js b/mocha_test/queue.js → test/queue.js
diff --git a/mocha_test/race.js → test/race.js b/mocha_test/race.js → test/race.js
diff --git a/mocha_test/reduce.js → test/reduce.js b/mocha_test/reduce.js → test/reduce.js
diff --git a/mocha_test/retry.js → test/retry.js b/mocha_test/retry.js → test/retry.js
diff --git a/mocha_test/retryable.js → test/retryable.js b/mocha_test/retryable.js → test/retryable.js
diff --git a/mocha_test/seq.js → test/seq.js b/mocha_test/seq.js → test/seq.js
diff --git a/mocha_test/series.js → test/series.js b/mocha_test/series.js → test/series.js
diff --git a/mocha_test/setImmediate.js → test/setImmediate.js b/mocha_test/setImmediate.js → test/setImmediate.js
diff --git a/mocha_test/slice.js → test/slice.js b/mocha_test/slice.js → test/slice.js
diff --git a/mocha_test/some.js → test/some.js b/mocha_test/some.js → test/some.js
diff --git a/mocha_test/sortBy.js → test/sortBy.js b/mocha_test/sortBy.js → test/sortBy.js
diff --git a/mocha_test/support/get_function_object.js → test/support/get_function_object.js b/mocha_test/support/get_function_object.js → test/support/get_function_object.js
diff --git a/mocha_test/timeout.js → test/timeout.js b/mocha_test/timeout.js → test/timeout.js
diff --git a/mocha_test/times.js → test/times.js b/mocha_test/times.js → test/times.js
diff --git a/mocha_test/transform.js → test/transform.js b/mocha_test/transform.js → test/transform.js
diff --git a/mocha_test/tryEach.js → test/tryEach.js b/mocha_test/tryEach.js → test/tryEach.js
diff --git a/mocha_test/until.js → test/until.js b/mocha_test/until.js → test/until.js
diff --git a/mocha_test/waterfall.js → test/waterfall.js b/mocha_test/waterfall.js → test/waterfall.js
diff --git a/mocha_test/whilst.js → test/whilst.js b/mocha_test/whilst.js → test/whilst.js