Skip to content

Commit

Permalink
Istanbul -> NYC (#2700)
Browse files Browse the repository at this point in the history
* istanbul -> nyc
  • Loading branch information
tgriesser committed Jul 9, 2018
1 parent 232fe9f commit 6cb02e0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ bin/db.sqlite3
# Bench stuff
test/bench/temp
test/coverage/*
.nyc_output

#VsCode workspace
.vscode
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ before_script:
script:
- if [ -z $TEST_ORACLEDB ]; then npm test; else npm run oracledb:test; fi

after_script:
- if [ -z $TEST_ORACLEDB ]; then npm run-script coveralls; fi
after_success:
- if [ -z $TEST_ORACLEDB ]; then npm run coveralls; fi

notifications:
email: false
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"chai": "^4.1.2",
"coveralls": "~3.0.2",
"coveralls": "^3.0.2",
"eslint": "5.0.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.13.0",
"husky": "^0.14.3",
"istanbul": "^0.4.5",
"nyc": "^12.0.2",
"json-loader": "^0.5.7",
"lint-staged": "^7.2.0",
"mocha": "^3.5.3",
Expand Down Expand Up @@ -78,17 +78,17 @@
"precommit": "lint-staged",
"format": "prettier --write \"{src,bin,scripts,test}/**/*.js\"",
"build": "npm run babel",
"debug_test": "node-debug _mocha -t 0 test/index.js",
"debug_test": "node --inspect-brk ./node_modules/.bin/_mocha -t 0 test/index.js",
"babel": "rimraf ./lib && babel src --out-dir lib --copy-files",
"coveralls": "cat ./test/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"coveralls": "nyc report --reporter=text-lcov | coveralls",
"dev": "rimraf ./lib && babel -w src --out-dir lib --copy-files",
"lint": "eslint src/**",
"plaintest": "mocha -t 10000 -b -R spec test/index.js && npm run tape",
"prepublish": "npm run babel",
"pre_test": "npm run lint",
"tape": "node test/tape/index.js | tap-spec",
"debug_tape": "node-debug test/tape/index.js",
"test": "npm run pre_test && istanbul --config=test/.istanbul.yml cover node_modules/mocha/bin/_mocha -- --check-leaks -t 10000 -b -R spec test/index.js && npm run tape",
"debug_tape": "node --inspect-brk test/tape/index.js",
"test": "npm run pre_test && nyc mocha --check-leaks -t 10000 -R spec test/index.js && npm run tape",
"oracledb:test": "docker rmi -f --no-prune knex-test-oracledb && docker build -f scripts/oracle-tests-Dockerfile --tag knex-test-oracledb . && docker run --rm -i -t -e KNEX_TEST_TIMEOUT=$KNEX_TEST_TIMEOUT -e NODE_VER=$NODE_VER knex-test-oracledb",
"mssql:init": "docker-compose -f scripts/mssql-docker-compose.yml up --no-start && docker-compose -f scripts/mssql-docker-compose.yml start",
"postmssql:init": "node scripts/wait-for-mssql-server.js && npm run mssql:logs || (npm run mssql:logs;false)",
Expand Down
6 changes: 1 addition & 5 deletions src/dialects/mysql/transaction.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import Transaction from '../../transaction';
import inherits from 'inherits';
import Debug from 'debug';
import { assign, isUndefined } from 'lodash';

const debug = Debug('knex:tx');

function Transaction_MySQL() {
Transaction.apply(this, arguments);
}
inherits(Transaction_MySQL, Transaction);
class Transaction_MySQL extends Transaction {}

assign(Transaction_MySQL.prototype, {
query(conn, sql, status, value) {
Expand Down
6 changes: 1 addition & 5 deletions src/dialects/mysql2/transaction.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import Transaction from '../../transaction';
import inherits from 'inherits';
const debug = require('debug')('knex:tx');

import { assign, isUndefined } from 'lodash';

function Transaction_MySQL2() {
Transaction.apply(this, arguments);
}
inherits(Transaction_MySQL2, Transaction);
class Transaction_MySQL2 extends Transaction {}

assign(Transaction_MySQL2.prototype, {
query(conn, sql, status, value) {
Expand Down

0 comments on commit 6cb02e0

Please sign in to comment.