diff --git a/package.json b/package.json index 982986d5..76268dd2 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,15 @@ { "name": "futil-js", - "version": "1.7.0", + "version": "1.7.1", "description": "F(unctional) util(ities). Resistance is futile.", "main": "lib/futil-js.js", "scripts": { "build": "webpack", - "test": "mocha", + "test": "babel-node ./node_modules/mocha/bin/_mocha", "test:watch": "chokidar 'src/*.js' 'test/*.js' -c 'npm t'", - "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha", - "cicoverage": "babel-node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info", - "lint": "eslint src/*.js test/*.js", - "pretest": "npm run build", - "precoverage": "npm run build" + "coverage": "nyc --require babel-core/register node_modules/.bin/mocha test", + "cicoverage": "nyc --reporter=lcov --require babel-core/register node_modules/.bin/mocha test && cat ./coverage/lcov.info", + "lint": "eslint src/*.js test/*.js" }, "author": "Samuel Greene ", "license": "MIT", @@ -38,9 +36,9 @@ "eslint-config-smartprocure": "^0.0.4", "eslint-plugin-lodash-fp": "^2.0.1", "eslint-plugin-mocha": "^4.8.0", - "istanbul": "^0.4.5", "mocha": "^3.2.0", "mocha-lcov-reporter": "^1.2.0", + "nyc": "^10.1.2", "webpack": "^2.2.1" }, "directories": { diff --git a/test/array.spec.js b/test/array.spec.js index 9705928a..b164a82a 100644 --- a/test/array.spec.js +++ b/test/array.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src/' chai.expect() const expect = chai.expect diff --git a/test/collections.spec.js b/test/collections.spec.js index 7b8d8c85..0dcb724e 100644 --- a/test/collections.spec.js +++ b/test/collections.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src/' chai.expect() const expect = chai.expect diff --git a/test/flipped.spec.js b/test/flipped.spec.js index 39a7f856..64826137 100644 --- a/test/flipped.spec.js +++ b/test/flipped.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src' chai.expect() const expect = chai.expect @@ -14,4 +14,4 @@ describe('Flipped FP Functions', function() { a: 1 })('a')).to.equal(1) }) -}) \ No newline at end of file +}) diff --git a/test/misc.spec.js b/test/misc.spec.js index 6411269a..8e3ad56a 100644 --- a/test/misc.spec.js +++ b/test/misc.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src' chai.expect() const expect = chai.expect diff --git a/test/mocha.opts b/test/mocha.opts deleted file mode 100644 index 3c71a931..00000000 --- a/test/mocha.opts +++ /dev/null @@ -1,2 +0,0 @@ - --compilers js:babel-core/register - --colors \ No newline at end of file diff --git a/test/mutables.spec.js b/test/mutables.spec.js index ab97a5f7..da2322c5 100644 --- a/test/mutables.spec.js +++ b/test/mutables.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src' chai.expect() const expect = chai.expect @@ -32,4 +32,4 @@ describe('Mutable FP Functions', function() { c: 4 }) }) -}) \ No newline at end of file +}) diff --git a/test/objects.spec.js b/test/objects.spec.js index 7c16a793..c9d47275 100644 --- a/test/objects.spec.js +++ b/test/objects.spec.js @@ -1,5 +1,5 @@ import chai from 'chai' -import * as f from '../lib/futil-js' +import * as f from '../src' chai.expect() const expect = chai.expect @@ -62,4 +62,4 @@ describe('Object Functions', function() { 'a.b.c': 1 }) }) -}) \ No newline at end of file +})