From c07848d78818a264aa270e8647e86b7f880255d9 Mon Sep 17 00:00:00 2001 From: Wes Todd Date: Tue, 22 Mar 2022 12:26:10 -0500 Subject: [PATCH] fix(devDeps): updated standard & mocha --- bin/migrate | 4 +-- bin/migrate-create | 17 +++++------ bin/migrate-down | 24 ++++++++-------- bin/migrate-init | 22 +++++++-------- bin/migrate-list | 24 ++++++++-------- bin/migrate-up | 24 ++++++++-------- .../cli/migrations/1316027432511-add-pets.js | 2 +- .../cli/migrations/1316027432512-add-jane.js | 2 +- .../migrations/1316027432575-add-owners.js | 2 +- .../migrations/1316027433425-coolest-pet.js | 2 +- examples/cli/migrations/db.js | 4 +-- .../mongo-state-storage.js | 2 ++ examples/env/db.js | 4 +-- examples/migrate.js | 10 +++---- index.js | 12 ++++---- lib/file-store.js | 7 +++-- lib/load-migrations.js | 28 +++++++++---------- lib/log.js | 2 +- lib/migrate.js | 16 +++++------ lib/register-compiler.js | 8 +++--- lib/set.js | 10 +++---- lib/template-generator.js | 26 ++++++++--------- package.json | 4 +-- test/basic.js | 8 +++--- test/cli.js | 22 +++++++-------- test/file-store.js | 8 +++--- test/fixtures/basic/1-add-guy-ferrets.js | 2 +- test/fixtures/basic/2-add-girl-ferrets.js | 2 +- test/fixtures/basic/3-add-emails.js | 2 +- .../env/migrations/1-add-guy-ferrets.js | 2 +- .../env/migrations/2-add-girl-ferrets.js | 2 +- test/fixtures/issue-33/1-migration.js | 2 +- test/fixtures/issue-33/2-migration.js | 2 +- test/fixtures/issue-33/3-migration.js | 2 +- test/fixtures/numbers/migrations/1-one.js | 4 +-- test/fixtures/numbers/migrations/2-two.js | 2 +- test/integration.js | 4 +-- test/issue-33.js | 6 ++-- test/promises.js | 6 ++-- test/util/db.js | 13 +++++---- test/util/run.js | 6 ++-- 41 files changed, 178 insertions(+), 173 deletions(-) diff --git a/bin/migrate b/bin/migrate index dc0737c..11d2490 100755 --- a/bin/migrate +++ b/bin/migrate @@ -2,8 +2,8 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var pkg = require('../package.json') +const program = require('commander') +const pkg = require('../package.json') program .version(pkg.version) diff --git a/bin/migrate-create b/bin/migrate-create index daeb262..d6bd1e4 100755 --- a/bin/migrate-create +++ b/bin/migrate-create @@ -2,12 +2,12 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var path = require('path') -var dotenv = require('dotenv') -var log = require('../lib/log') -var registerCompiler = require('../lib/register-compiler') -var pkg = require('../package.json') +const program = require('commander') +const path = require('path') +const dotenv = require('dotenv') +const log = require('../lib/log') +const registerCompiler = require('../lib/register-compiler') +const pkg = require('../package.json') program .version(pkg.version) @@ -30,7 +30,7 @@ if (program.extention) { // Setup environment if (program.env) { - var e = dotenv.config({ + const e = dotenv.config({ path: typeof program.env === 'string' ? program.env : '.env' }) if (e && e.error instanceof Error) { @@ -38,6 +38,7 @@ if (program.env) { } } +// eslint-disable-next-line no-var var _name function create (name) { // Name provided? @@ -52,7 +53,7 @@ function create (name) { } // Load the template generator - var gen + let gen try { gen = require(program.generator) } catch (e) { diff --git a/bin/migrate-down b/bin/migrate-down index bf57d16..a5d22ec 100755 --- a/bin/migrate-down +++ b/bin/migrate-down @@ -2,15 +2,15 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var path = require('path') -var minimatch = require('minimatch') -var dotenv = require('dotenv') -var migrate = require('../') -var runMigrations = require('../lib/migrate') -var log = require('../lib/log') -var registerCompiler = require('../lib/register-compiler') -var pkg = require('../package.json') +const program = require('commander') +const path = require('path') +const minimatch = require('minimatch') +const dotenv = require('dotenv') +const migrate = require('../') +const runMigrations = require('../lib/migrate') +const log = require('../lib/log') +const registerCompiler = require('../lib/register-compiler') +const pkg = require('../package.json') program .version(pkg.version) @@ -30,7 +30,7 @@ process.chdir(program.chdir) // Setup environment if (program.env) { - var e = dotenv.config({ + const e = dotenv.config({ path: typeof program.env === 'string' ? program.env : '.env' }) if (e && e.error instanceof Error) { @@ -46,8 +46,8 @@ if (program.compiler) { // Setup store if (program.store[0] === '.') program.store = path.join(process.cwd(), program.store) -var Store = require(program.store) -var store = new Store(program.stateFile) +const Store = require(program.store) +const store = new Store(program.stateFile) // Load in migrations migrate.load({ diff --git a/bin/migrate-init b/bin/migrate-init index b67d41a..94884f8 100755 --- a/bin/migrate-init +++ b/bin/migrate-init @@ -2,13 +2,13 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var mkdirp = require('mkdirp') -var dotenv = require('dotenv') -var path = require('path') -var log = require('../lib/log') -var pkg = require('../package.json') -var registerCompiler = require('../lib/register-compiler') +const program = require('commander') +const mkdirp = require('mkdirp') +const dotenv = require('dotenv') +const path = require('path') +const log = require('../lib/log') +const pkg = require('../package.json') +const registerCompiler = require('../lib/register-compiler') program .version(pkg.version) @@ -25,7 +25,7 @@ process.chdir(program.chdir) // Setup environment if (program.env) { - var e = dotenv.config({ + const e = dotenv.config({ path: typeof program.env === 'string' ? program.env : '.env' }) if (e && e.error instanceof Error) { @@ -41,11 +41,11 @@ if (program.compiler) { // Setup store if (program.store[0] === '.') program.store = path.join(process.cwd(), program.store) -var Store = require(program.store) -var store = new Store(program.stateFile) +const Store = require(program.store) +const store = new Store(program.stateFile) // Create migrations dir path -var p = path.resolve(process.cwd(), program.migrationsDir) +const p = path.resolve(process.cwd(), program.migrationsDir) log('migrations dir', p) mkdirp.sync(p) diff --git a/bin/migrate-list b/bin/migrate-list index 5144aec..7c48db8 100755 --- a/bin/migrate-list +++ b/bin/migrate-list @@ -2,15 +2,15 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var path = require('path') -var dateFormat = require('dateformat') -var minimatch = require('minimatch') -var dotenv = require('dotenv') -var migrate = require('../') -var log = require('../lib/log') -var registerCompiler = require('../lib/register-compiler') -var pkg = require('../package.json') +const program = require('commander') +const path = require('path') +const dateFormat = require('dateformat') +const minimatch = require('minimatch') +const dotenv = require('dotenv') +const migrate = require('../') +const log = require('../lib/log') +const registerCompiler = require('../lib/register-compiler') +const pkg = require('../package.json') program .version(pkg.version) @@ -36,7 +36,7 @@ process.chdir(program.chdir) // Setup environment if (program.env) { - var e = dotenv.config({ + const e = dotenv.config({ path: typeof program.env === 'string' ? program.env : '.env' }) if (e && e.error instanceof Error) { @@ -52,8 +52,8 @@ if (program.compiler) { // Setup store if (program.store[0] === '.') program.store = path.join(process.cwd(), program.store) -var Store = require(program.store) -var store = new Store(program.stateFile) +const Store = require(program.store) +const store = new Store(program.stateFile) // Load in migrations migrate.load({ diff --git a/bin/migrate-up b/bin/migrate-up index f257a3a..a3ceb84 100755 --- a/bin/migrate-up +++ b/bin/migrate-up @@ -2,15 +2,15 @@ // vim: set ft=javascript: 'use strict' -var program = require('commander') -var path = require('path') -var minimatch = require('minimatch') -var dotenv = require('dotenv') -var migrate = require('../') -var runMigrations = require('../lib/migrate') -var log = require('../lib/log') -var registerCompiler = require('../lib/register-compiler') -var pkg = require('../package.json') +const program = require('commander') +const path = require('path') +const minimatch = require('minimatch') +const dotenv = require('dotenv') +const migrate = require('../') +const runMigrations = require('../lib/migrate') +const log = require('../lib/log') +const registerCompiler = require('../lib/register-compiler') +const pkg = require('../package.json') program .version(pkg.version) @@ -32,7 +32,7 @@ process.chdir(program.chdir) // Setup environment if (program.env) { - var e = dotenv.config({ + const e = dotenv.config({ path: typeof program.env === 'string' ? program.env : '.env' }) if (e && e.error instanceof Error) { @@ -60,8 +60,8 @@ if (program.compiler) { // Setup store if (program.store[0] === '.') program.store = path.join(process.cwd(), program.store) -var Store = require(program.store) -var store = new Store(program.stateFile) +const Store = require(program.store) +const store = new Store(program.stateFile) // Call store init if (program.init && typeof store.init === 'function') { diff --git a/examples/cli/migrations/1316027432511-add-pets.js b/examples/cli/migrations/1316027432511-add-pets.js index 2e550ad..5ec835c 100644 --- a/examples/cli/migrations/1316027432511-add-pets.js +++ b/examples/cli/migrations/1316027432511-add-pets.js @@ -1,5 +1,5 @@ -var db = require('./db') +const db = require('./db') exports.up = function (next) { db.rpush('pets', 'tobi') diff --git a/examples/cli/migrations/1316027432512-add-jane.js b/examples/cli/migrations/1316027432512-add-jane.js index 8de2648..fdf1e2d 100644 --- a/examples/cli/migrations/1316027432512-add-jane.js +++ b/examples/cli/migrations/1316027432512-add-jane.js @@ -1,5 +1,5 @@ -var db = require('./db') +const db = require('./db') exports.up = function (next) { db.rpush('pets', 'jane', next) diff --git a/examples/cli/migrations/1316027432575-add-owners.js b/examples/cli/migrations/1316027432575-add-owners.js index 6eb6282..b140ecf 100644 --- a/examples/cli/migrations/1316027432575-add-owners.js +++ b/examples/cli/migrations/1316027432575-add-owners.js @@ -1,5 +1,5 @@ -var db = require('./db') +const db = require('./db') exports.up = function (next) { db.rpush('owners', 'taylor') diff --git a/examples/cli/migrations/1316027433425-coolest-pet.js b/examples/cli/migrations/1316027433425-coolest-pet.js index e5c0242..41b36a7 100644 --- a/examples/cli/migrations/1316027433425-coolest-pet.js +++ b/examples/cli/migrations/1316027433425-coolest-pet.js @@ -1,5 +1,5 @@ -var db = require('./db') +const db = require('./db') exports.up = function (next) { db.set('pets:coolest', 'tobi', next) diff --git a/examples/cli/migrations/db.js b/examples/cli/migrations/db.js index fa9fc94..7d4535a 100644 --- a/examples/cli/migrations/db.js +++ b/examples/cli/migrations/db.js @@ -4,7 +4,7 @@ // $ npm install redis // $ redis-server -var redis = require('redis') -var db = redis.createClient() +const redis = require('redis') +const db = redis.createClient() module.exports = db diff --git a/examples/custom-state-storage/mongo-state-storage.js b/examples/custom-state-storage/mongo-state-storage.js index c5fe24d..0ef3df3 100644 --- a/examples/custom-state-storage/mongo-state-storage.js +++ b/examples/custom-state-storage/mongo-state-storage.js @@ -16,6 +16,7 @@ class MongoDbStore { return fn(null, {}) } } catch (err) { + console.log(err) throw err } finally { client.close() @@ -39,6 +40,7 @@ class MongoDbStore { } }, { upsert: true }) } catch (err) { + console.log(err) throw err } finally { client.close() diff --git a/examples/env/db.js b/examples/env/db.js index b151444..3138ed5 100644 --- a/examples/env/db.js +++ b/examples/env/db.js @@ -1,5 +1,5 @@ 'use strict' -var fs = require('fs') +const fs = require('fs') module.exports = { loaded: false, @@ -25,7 +25,7 @@ module.exports = { }, load: function () { if (this.loaded) return this - var json + let json try { json = JSON.parse(fs.readFileSync('.db', 'utf8')) } catch (e) { diff --git a/examples/migrate.js b/examples/migrate.js index c6a56eb..fd80231 100644 --- a/examples/migrate.js +++ b/examples/migrate.js @@ -4,10 +4,10 @@ // $ npm install redis // $ redis-server -var path = require('path') -var migrate = require('../') -var redis = require('redis') -var db = redis.createClient() +const path = require('path') +const migrate = require('../') +const redis = require('redis') +const db = redis.createClient() migrate(path.join(__dirname, '.migrate')) @@ -39,7 +39,7 @@ migrate('coolest pet', function (next) { db.del('pets:coolest', next) }) -var set = migrate() +const set = migrate() console.log() set.on('save', function () { diff --git a/index.js b/index.js index b6a9a24..1219ef1 100644 --- a/index.js +++ b/index.js @@ -10,9 +10,9 @@ * Module dependencies. */ -var MigrationSet = require('./lib/set') -var FileStore = require('./lib/file-store') -var loadMigrationsIntoSet = require('./lib/load-migrations') +const MigrationSet = require('./lib/set') +const FileStore = require('./lib/file-store') +const loadMigrationsIntoSet = require('./lib/load-migrations') /** * Expose the migrate function. @@ -42,13 +42,13 @@ function migrate (title, up, down) { exports.MigrationSet = MigrationSet exports.load = function (options, fn) { - var opts = options || {} + const opts = options || {} // Create default store - var store = (typeof opts.stateStore === 'string') ? new FileStore(opts.stateStore) : opts.stateStore + const store = (typeof opts.stateStore === 'string') ? new FileStore(opts.stateStore) : opts.stateStore // Create migration set - var set = new MigrationSet(store) + const set = new MigrationSet(store) loadMigrationsIntoSet({ set: set, diff --git a/lib/file-store.js b/lib/file-store.js index 6915b6c..71d4203 100644 --- a/lib/file-store.js +++ b/lib/file-store.js @@ -1,6 +1,7 @@ 'use strict' -var fs = require('fs') +const fs = require('fs') +const hasOwnProperty = Object.prototype.hasOwnProperty module.exports = FileStore @@ -44,7 +45,7 @@ FileStore.prototype.load = function (fn) { } // Check if old format and convert if needed - if (!store.hasOwnProperty('lastRun') && store.hasOwnProperty('pos')) { + if (!hasOwnProperty.call(store, 'lastRun') && hasOwnProperty.call(store, 'pos')) { if (store.pos === 0) { store.lastRun = null } else { @@ -64,7 +65,7 @@ FileStore.prototype.load = function (fn) { } // Check if does not have required properties - if (!store.hasOwnProperty('lastRun') || !store.hasOwnProperty('migrations')) { + if (!hasOwnProperty.call(store, 'lastRun') || !hasOwnProperty.call(store, 'migrations')) { return fn(new Error('Invalid store file')) } diff --git a/lib/load-migrations.js b/lib/load-migrations.js index 9222d64..0328fe8 100644 --- a/lib/load-migrations.js +++ b/lib/load-migrations.js @@ -1,23 +1,23 @@ 'use strict' -var path = require('path') -var fs = require('fs') -var Migration = require('./migration') +const path = require('path') +const fs = require('fs') +const Migration = require('./migration') module.exports = loadMigrationsIntoSet function loadMigrationsIntoSet (options, fn) { // Process options, set and store are required, rest optional - var opts = options || {} + const opts = options || {} if (!opts.set || !opts.store) { throw new TypeError((opts.set ? 'store' : 'set') + ' is required for loading migrations') } - var set = opts.set - var store = opts.store - var ignoreMissing = !!opts.ignoreMissing - var migrationsDirectory = path.resolve(opts.migrationsDirectory || 'migrations') - var filterFn = opts.filterFunction || (() => true) - var sortFn = opts.sortFunction || function (m1, m2) { + const set = opts.set + const store = opts.store + const ignoreMissing = !!opts.ignoreMissing + const migrationsDirectory = path.resolve(opts.migrationsDirectory || 'migrations') + const filterFn = opts.filterFunction || (() => true) + const sortFn = opts.sortFunction || function (m1, m2) { return m1.title > m2.title ? 1 : (m1.title < m2.title ? -1 : 0) } @@ -36,17 +36,17 @@ function loadMigrationsIntoSet (options, fn) { files = files.filter(filterFn) // Create migrations, keep a lookup map for the next step - var migMap = {} - var migrations = files.map(function (file) { + const migMap = {} + let migrations = files.map(function (file) { // Try to load the migrations file - var mod + let mod try { mod = require(path.join(migrationsDirectory, file)) } catch (e) { return fn(e) } - var migration = new Migration(file, mod.up, mod.down, mod.description) + const migration = new Migration(file, mod.up, mod.down, mod.description) migMap[file] = migration return migration }) diff --git a/lib/log.js b/lib/log.js index a86fe59..53dbb1f 100644 --- a/lib/log.js +++ b/lib/log.js @@ -1,5 +1,5 @@ 'use strict' -var chalk = require('chalk') +const chalk = require('chalk') module.exports = function log (key, msg) { console.log(' ' + chalk.grey(key) + ' : ' + chalk.cyan(msg)) diff --git a/lib/migrate.js b/lib/migrate.js index 6fbd190..1fc776b 100644 --- a/lib/migrate.js +++ b/lib/migrate.js @@ -3,9 +3,9 @@ module.exports = migrate function migrate (set, direction, migrationName, fn) { - var migrations = [] - var lastRunIndex - var toIndex + let migrations = [] + let lastRunIndex + let toIndex if (!migrationName) { toIndex = direction === 'up' ? set.migrations.length : 0 @@ -27,12 +27,12 @@ function migrate (set, direction, migrationName, fn) { } // Status for supporting promises and callbacks - var isPromise = false + let isPromise = false // Run the migration function set.emit('migration', migration, direction) - var arity = migration[direction].length - var returnValue = migration[direction](function (err) { + const arity = migration[direction].length + const returnValue = migration[direction](function (err) { if (isPromise) return set.emit('warning', 'if your migration returns a promise, do not call the done callback') completeMigration(err) }) @@ -115,8 +115,8 @@ function downMigrations (set, lastRunIndex, toIndex) { */ function positionOfMigration (migrations, title) { - var lastTimestamp - for (var i = 0; i < migrations.length; ++i) { + let lastTimestamp + for (let i = 0; i < migrations.length; ++i) { lastTimestamp = migrations[i].timestamp ? i : lastTimestamp if (migrations[i].title === title) return i } diff --git a/lib/register-compiler.js b/lib/register-compiler.js index 8294383..a678bca 100644 --- a/lib/register-compiler.js +++ b/lib/register-compiler.js @@ -1,12 +1,12 @@ 'use strict' -var path = require('path') +const path = require('path') module.exports = registerCompiler function registerCompiler (c) { - var compiler = c.split(':') - var ext = compiler[0] - var mod = compiler[1] + const compiler = c.split(':') + const ext = compiler[0] + let mod = compiler[1] if (mod[0] === '.') mod = path.join(process.cwd(), mod) require(mod)({ diff --git a/lib/set.js b/lib/set.js index 4c8c3cc..eae8782 100644 --- a/lib/set.js +++ b/lib/set.js @@ -10,10 +10,10 @@ * Module dependencies. */ -var EventEmitter = require('events') -var Migration = require('./migration') -var migrate = require('./migrate') -var inherits = require('inherits') +const EventEmitter = require('events') +const Migration = require('./migration') +const migrate = require('./migrate') +const inherits = require('inherits') /** * Expose `Set`. @@ -52,7 +52,7 @@ inherits(MigrationSet, EventEmitter) */ MigrationSet.prototype.addMigration = function (title, up, down) { - var migration + let migration if (!(title instanceof Migration)) { migration = new Migration(title, up, down) } else { diff --git a/lib/template-generator.js b/lib/template-generator.js index 42c49d6..2978ded 100644 --- a/lib/template-generator.js +++ b/lib/template-generator.js @@ -1,18 +1,18 @@ 'use strict' -var path = require('path') -var fs = require('fs') -var slug = require('slug') -var formatDate = require('dateformat') -var mkdirp = require('mkdirp') +const path = require('path') +const fs = require('fs') +const slug = require('slug') +const formatDate = require('dateformat') +const mkdirp = require('mkdirp') module.exports = function templateGenerator (opts, cb) { // Setup default options opts = opts || {} - var name = opts.name - var dateFormat = opts.dateFormat - var templateFile = opts.templateFile || path.join(__dirname, 'template.js') - var migrationsDirectory = opts.migrationsDirectory || 'migrations' - var extension = opts.extension + const name = opts.name + const dateFormat = opts.dateFormat + const templateFile = opts.templateFile || path.join(__dirname, 'template.js') + const migrationsDirectory = opts.migrationsDirectory || 'migrations' + const extension = opts.extension loadTemplate(templateFile, function (err, template) { if (err) return cb(err) @@ -22,10 +22,10 @@ module.exports = function templateGenerator (opts, cb) { if (err) return cb(err) // Create date string - var formattedDate = dateFormat ? formatDate(new Date(), dateFormat) : Date.now() + const formattedDate = dateFormat ? formatDate(new Date(), dateFormat) : Date.now() // Fix up file path - var p = path.join(path.resolve(migrationsDirectory), slug(formattedDate + (name ? '-' + name : '')) + extension) + const p = path.join(path.resolve(migrationsDirectory), slug(formattedDate + (name ? '-' + name : '')) + extension) // Write the template file fs.writeFile(p, template, function (err) { @@ -36,7 +36,7 @@ module.exports = function templateGenerator (opts, cb) { }) } -var _templateCache = {} +const _templateCache = {} function loadTemplate (tmpl, cb) { if (_templateCache[tmpl]) { return cb(null, _templateCache) diff --git a/package.json b/package.json index 99b920f..f2d40bf 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "migrate-down": "./bin/migrate-down" }, "devDependencies": { - "mocha": "^5.2.0", + "mocha": "^9.2.2", "rimraf": "^2.6.2", - "standard": "^12.0.1" + "standard": "^16.0.4" }, "main": "index", "engines": { diff --git a/test/basic.js b/test/basic.js index 95af562..f69616e 100644 --- a/test/basic.js +++ b/test/basic.js @@ -10,7 +10,7 @@ const BASE = path.join(__dirname, 'fixtures', 'basic') const STATE = path.join(BASE, '.migrate') describe('migration set', function () { - var set + let set function assertNoPets () { assert.strictEqual(db.pets.length, 0) @@ -130,9 +130,9 @@ describe('migration set', function () { } ) - var saved = 0 - var migrations = [] - var expectedMigrations = [ + let saved = 0 + let migrations = [] + let expectedMigrations = [ '1-add-guy-ferrets.js', '2-add-girl-ferrets.js', '3-add-emails.js', diff --git a/test/cli.js b/test/cli.js index 3d70a99..8466fcd 100644 --- a/test/cli.js +++ b/test/cli.js @@ -57,8 +57,8 @@ describe('$ migrate', function () { create(['test'], function (err, out, code) { assert(!err) assert.strictEqual(code, 0) - var file = out.split(':')[1].trim() - var content = fs.readFileSync(file, { + const file = out.split(':')[1].trim() + const content = fs.readFileSync(file, { encoding: 'utf8' }) assert(content) @@ -69,9 +69,9 @@ describe('$ migrate', function () { }) it('should respect the --date-format', function (done) { - var name = 'test' - var fmt = 'yyyy-mm-dd' - var now = formatDate(new Date(), fmt) + const name = 'test' + const fmt = 'yyyy-mm-dd' + const now = formatDate(new Date(), fmt) create([name, '-d', fmt], function (err, out, code) { assert(!err) @@ -84,10 +84,10 @@ describe('$ migrate', function () { }) it('should respect the --extension', function (done) { - var name = 'test' - var fmt = 'yyyy-mm-dd' - var ext = '.mjs' - var now = formatDate(new Date(), fmt) + const name = 'test' + const fmt = 'yyyy-mm-dd' + const ext = '.mjs' + const now = formatDate(new Date(), fmt) create([name, '-d', fmt, '-e', ext], function (err, out, code) { assert(!err) @@ -120,8 +120,8 @@ describe('$ migrate', function () { assert(!err) assert.strictEqual(code, 0, out) assert(out.indexOf('create') !== -1) - var file = out.split(':')[1].trim() - var content = fs.readFileSync(file, { + const file = out.split(':')[1].trim() + const content = fs.readFileSync(file, { encoding: 'utf8' }) assert(content.indexOf('test') !== -1) diff --git a/test/file-store.js b/test/file-store.js index 6049ffd..55e383f 100644 --- a/test/file-store.js +++ b/test/file-store.js @@ -12,7 +12,7 @@ const INVALID_STORE_FILE = path.join(BASE, 'invalid-store') describe('FileStore tests', function () { it('should load store file', function (done) { - let store = new FileStore(MODERN_STORE_FILE) + const store = new FileStore(MODERN_STORE_FILE) store.load(function (err, store) { if (err) { return done(err) @@ -26,7 +26,7 @@ describe('FileStore tests', function () { }) it('should convert pre-v1 store file format', function (done) { - let store = new FileStore(OLD_STORE_FILE) + const store = new FileStore(OLD_STORE_FILE) store.load(function (err, store) { if (err) { return done(err) @@ -45,7 +45,7 @@ describe('FileStore tests', function () { }) it('should error with invalid store file format', function (done) { - let store = new FileStore(BAD_STORE_FILE) + const store = new FileStore(BAD_STORE_FILE) store.load(function (err, store) { if (!err) { return done(new Error('Error expected')) @@ -58,7 +58,7 @@ describe('FileStore tests', function () { }) it('should error with invalid pos', function (done) { - let store = new FileStore(INVALID_STORE_FILE) + const store = new FileStore(INVALID_STORE_FILE) store.load(function (err, store) { if (!err) { return done(new Error('Error expected')) diff --git a/test/fixtures/basic/1-add-guy-ferrets.js b/test/fixtures/basic/1-add-guy-ferrets.js index d328485..9960bee 100644 --- a/test/fixtures/basic/1-add-guy-ferrets.js +++ b/test/fixtures/basic/1-add-guy-ferrets.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.description = 'Adds two pets' diff --git a/test/fixtures/basic/2-add-girl-ferrets.js b/test/fixtures/basic/2-add-girl-ferrets.js index a096e31..1fd00ca 100644 --- a/test/fixtures/basic/2-add-girl-ferrets.js +++ b/test/fixtures/basic/2-add-girl-ferrets.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.up = function (next) { db.pets.push({ name: 'jane' }) diff --git a/test/fixtures/basic/3-add-emails.js b/test/fixtures/basic/3-add-emails.js index 4e89607..1fd41a4 100644 --- a/test/fixtures/basic/3-add-emails.js +++ b/test/fixtures/basic/3-add-emails.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.up = function (next) { db.pets.forEach(function (pet) { diff --git a/test/fixtures/env/migrations/1-add-guy-ferrets.js b/test/fixtures/env/migrations/1-add-guy-ferrets.js index 5c8ad08..2e04b0a 100755 --- a/test/fixtures/env/migrations/1-add-guy-ferrets.js +++ b/test/fixtures/env/migrations/1-add-guy-ferrets.js @@ -1,4 +1,4 @@ -var db = require('../../../util/db') +const db = require('../../../util/db') exports.up = function (next) { db[process.env.DB].push({ name: 'tobi' }) diff --git a/test/fixtures/env/migrations/2-add-girl-ferrets.js b/test/fixtures/env/migrations/2-add-girl-ferrets.js index ff78cfb..74c9226 100755 --- a/test/fixtures/env/migrations/2-add-girl-ferrets.js +++ b/test/fixtures/env/migrations/2-add-girl-ferrets.js @@ -1,4 +1,4 @@ -var db = require('../../../util/db') +const db = require('../../../util/db') exports.up = function (next) { db[process.env.DB].push({ name: 'jane' }) diff --git a/test/fixtures/issue-33/1-migration.js b/test/fixtures/issue-33/1-migration.js index 6d866d3..94ff328 100644 --- a/test/fixtures/issue-33/1-migration.js +++ b/test/fixtures/issue-33/1-migration.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.up = function (next) { db.issue33.push('1-up') diff --git a/test/fixtures/issue-33/2-migration.js b/test/fixtures/issue-33/2-migration.js index 159c3d5..770d849 100644 --- a/test/fixtures/issue-33/2-migration.js +++ b/test/fixtures/issue-33/2-migration.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.up = function (next) { db.issue33.push('2-up') diff --git a/test/fixtures/issue-33/3-migration.js b/test/fixtures/issue-33/3-migration.js index b94ad4c..91beab6 100644 --- a/test/fixtures/issue-33/3-migration.js +++ b/test/fixtures/issue-33/3-migration.js @@ -1,5 +1,5 @@ -var db = require('../../util/db') +const db = require('../../util/db') exports.up = function (next) { db.issue33.push('3-up') diff --git a/test/fixtures/numbers/migrations/1-one.js b/test/fixtures/numbers/migrations/1-one.js index 57ff81d..62b24e3 100755 --- a/test/fixtures/numbers/migrations/1-one.js +++ b/test/fixtures/numbers/migrations/1-one.js @@ -1,5 +1,5 @@ -var assert = require('assert') -var db = require('../../../util/db') +const assert = require('assert') +const db = require('../../../util/db') exports.up = function (next) { db.load() diff --git a/test/fixtures/numbers/migrations/2-two.js b/test/fixtures/numbers/migrations/2-two.js index 6ce9d49..826ed88 100755 --- a/test/fixtures/numbers/migrations/2-two.js +++ b/test/fixtures/numbers/migrations/2-two.js @@ -1,4 +1,4 @@ -var db = require('../../../util/db') +const db = require('../../../util/db') exports.up = function (next) { db.load() diff --git a/test/integration.js b/test/integration.js index b0c4eac..f0d0bf0 100644 --- a/test/integration.js +++ b/test/integration.js @@ -75,7 +75,7 @@ describe('integration tests', function () { assert.strictEqual(code, 0) // Keep migration filename to remove - var filename = out.split(' : ')[1].trim() + const filename = out.split(' : ')[1].trim() run.up(TMP_DIR, [], function (err, out, code) { assert(!err) @@ -115,7 +115,7 @@ describe('integration tests', function () { assert.strictEqual(code, 0) // Keep migration filename to remove - var filename = out.split(' : ')[1].trim() + const filename = out.split(' : ')[1].trim() run.up(TMP_DIR, [], function (err, out, code) { assert(!err) diff --git a/test/issue-33.js b/test/issue-33.js index 1b42732..f69cc70 100644 --- a/test/issue-33.js +++ b/test/issue-33.js @@ -9,11 +9,11 @@ const db = require('./util/db') const BASE = path.join(__dirname, 'fixtures', 'issue-33') const STATE = path.join(BASE, '.migrate') -var A1 = ['1-up', '2-up', '3-up'] -var A2 = A1.concat(['3-down', '2-down', '1-down']) +const A1 = ['1-up', '2-up', '3-up'] +const A2 = A1.concat(['3-down', '2-down', '1-down']) describe('issue #33', function () { - var set + let set beforeEach(function (done) { migrate.load({ diff --git a/test/promises.js b/test/promises.js index 81219ab..bb687ef 100644 --- a/test/promises.js +++ b/test/promises.js @@ -9,7 +9,7 @@ const BASE = path.join(__dirname, 'fixtures', 'promises') const STATE = path.join(__dirname, 'fixtures', '.migrate') describe('Promise migrations', function () { - var set + let set beforeEach(function (done) { migrate.load({ @@ -40,7 +40,7 @@ describe('Promise migrations', function () { }) it('should warn when using promise but still calling callback', function (done) { - var warned = false + let warned = false set.on('warning', function (msg) { assert(msg) warned = true @@ -53,7 +53,7 @@ describe('Promise migrations', function () { it('should warn with no promise or callback', function (done) { set.up('3-callback-promise-test.js', function () { - var warned = false + let warned = false set.on('warning', function (msg) { assert(msg) warned = true diff --git a/test/util/db.js b/test/util/db.js index 82a261b..e533221 100644 --- a/test/util/db.js +++ b/test/util/db.js @@ -1,8 +1,8 @@ -var fs = require('fs') -var path = require('path') -var rimraf = require('rimraf') +const fs = require('fs') +const path = require('path') +const rimraf = require('rimraf') -var DB_PATH = path.join(__dirname, 'test.db') +const DB_PATH = path.join(__dirname, 'test.db') function init () { exports.pets = [] @@ -16,12 +16,13 @@ function nuke () { } function load () { + let c try { - var c = fs.readFileSync(DB_PATH, 'utf8') + c = fs.readFileSync(DB_PATH, 'utf8') } catch (e) { return } - var j = JSON.parse(c) + const j = JSON.parse(c) Object.keys(j).forEach(function (k) { exports[k] = j[k] }) diff --git a/test/util/run.js b/test/util/run.js index e7c1c73..ee7f49b 100644 --- a/test/util/run.js +++ b/test/util/run.js @@ -2,9 +2,9 @@ const path = require('path') const spawn = require('child_process').spawn -var run = module.exports = function run (cmd, dir, args, done) { - var p = spawn(cmd, ['-c', dir, ...args]) - var out = '' +const run = module.exports = function run (cmd, dir, args, done) { + const p = spawn(cmd, ['-c', dir, ...args]) + let out = '' p.stdout.on('data', function (d) { out += d.toString('utf8') })