Skip to content

Commit bd86f42

Browse files
committed
move mocha_tests/ to test/
1 parent b149f7d commit bd86f42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+12
-12
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix:
99
include:
1010
- node_js: "10"
1111
addons:
12-
firefox: "57.0"
12+
firefox: "60.0"
1313
env: BROWSER=true MAKE_TEST=true
1414
env:
1515
matrix: BROWSER=false MAKE_TEST=false

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ JS_INDEX = lib/index.js
1717
SCRIPTS = ./support
1818
JS_SRC = $(shell find lib/ -type f -name '*.js') lib/index.js
1919
INDEX_SRC = $(shell find lib/ -type f -name '*.js' | grep -v 'index') $(SCRIPTS)/index-template.js $(SCRIPTS)/aliases.json ${SCRIPTS}/generate-index.js
20-
LINT_FILES = lib/ mocha_test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js
20+
LINT_FILES = lib/ test/ $(shell find perf/ -maxdepth 2 -type f) $(shell find support/ -maxdepth 2 -type f -name "*.js") karma.conf.js
2121

2222
UMD_BUNDLE = $(BUILDDIR)/dist/async.js
2323
UMD_BUNDLE_MIN = $(BUILDDIR)/dist/async.min.js

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ignore": [
55
"bower_components",
66
"lib",
7-
"mocha_test",
7+
"test",
88
"node_modules",
99
"perf",
1010
"support",

karma.conf.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = function(config) {
22
config.set({
33
browsers: ['Firefox'],
4-
files: ['mocha_test/*.js'],
4+
files: ['test/*.js'],
55
frameworks: ['browserify', 'mocha'],
66
plugins: [
77
'karma-browserify',
@@ -10,7 +10,7 @@ module.exports = function(config) {
1010
'karma-firefox-launcher'
1111
],
1212
preprocessors: {
13-
'mocha_test/*.js': ['browserify']
13+
'test/*.js': ['browserify']
1414
},
1515
reporters: ['mocha'],
1616
singleRun: true,

mocha_test/mocha.opts

-4
This file was deleted.

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"coverage": "nyc npm run mocha-node-test -- --grep @nycinvalid --invert",
6161
"coveralls": "npm run coverage && nyc report --reporter=text-lcov | coveralls",
6262
"jsdoc": "jsdoc -c ./support/jsdoc/jsdoc.json && node support/jsdoc/jsdoc-fix-html.js",
63-
"lint": "eslint lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js",
63+
"lint": "eslint lib/ test/ perf/memory.js perf/suites.js perf/benchmark.js support/build/ support/*.js karma.conf.js",
6464
"mocha-browser-test": "karma start",
65-
"mocha-node-test": "mocha mocha_test/ --compilers js:babel-core/register",
65+
"mocha-node-test": "mocha",
6666
"mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",
6767
"test": "npm run lint && npm run mocha-node-test"
6868
},
@@ -72,7 +72,7 @@
7272
},
7373
"nyc": {
7474
"exclude": [
75-
"mocha_test"
75+
"test"
7676
]
7777
}
7878
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/mocha.opts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--require babel-core/register
2+
--recursive
3+
--growl
4+
--ui bdd
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)