update ava

Author: bojand

package-lock.json

@@ -62,7 +62,7 @@
   "devDependencies": {
     "@grpc/proto-loader": "^0.5.4",
     "async": "^3.0.0",
-    "ava": "^2.3.0",
+    "ava": "^3.0.0",
     "coveralls": "^3.0.6",
     "google-protobuf": "^3.9.1",
     "grpc": "^1.23.3",

package.json

@@ -1,14 +1,14 @@
-import test from 'ava'
-import path from 'path'
-import grpc from 'grpc'
-import CallType from '@malijs/call-types'
-import hl from 'highland'
-import async from 'async'
-import _ from 'lodash'
-import pMap from 'p-map'
-
-import Mali from '../'
-import * as tu from './util'
+const test = require('ava')
+const path = require('path')
+const grpc = require('grpc')
+const CallType = require('@malijs/call-types')
+const hl = require('highland')
+const async = require('async')
+const _ = require('lodash')
+const pMap = require('p-map')
+
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 

test/app.context.test.js

@@ -1,13 +1,13 @@
-import test from 'ava'
-import path from 'path'
-import grpc from 'grpc'
-import hl from 'highland'
-import async from 'async'
-import _ from 'lodash'
-import isCI from 'is-ci'
+const test = require('ava')
+const path = require('path')
+const grpc = require('grpc')
+const hl = require('highland')
+const async = require('async')
+const _ = require('lodash')
+const isCI = require('is-ci')
 
-import Mali from '../'
-import * as tu from './util'
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 
@@ -215,7 +215,7 @@ test.cb('app.start() should throw when binding to taken port', t => {
 
   const error = t.throws(() => {
     app2.start(`0.0.0.0:${app.ports[0]}`)
-  }, Error)
+  }, { instanceOf: Error })
 
   console.log(error)
   t.is(error.message, `Failed to bind to port: ${port}`)

test/app.test.js

@@ -1,9 +1,9 @@
-import test from 'ava'
-import CallType from '@malijs/call-types'
+const test = require('ava')
+const CallType = require('@malijs/call-types')
 
-import Request from '../lib/request'
-import Response from '../lib/response'
-import Mali from '../'
+const Request = require('../lib/request')
+const Response = require('../lib/response')
+const Mali = require('../')
 
 test('createContext should create context for a UNARY call', t => {
   const app = new Mali()

test/context.test.js

@@ -1,10 +1,10 @@
-import test from 'ava'
-import path from 'path'
-import _ from 'lodash'
-import pMap from 'p-map'
+const test = require('ava')
+const path = require('path')
+const _ = require('lodash')
+const pMap = require('p-map')
 
-import Mali from '../'
-import * as tu from './util'
+const Mali = require('../')
+const tu = require('./util')
 
 const PROTO_PATH = path.resolve(__dirname, './protos/helloworld.proto')
 const PROTO_PATH_MULTI = path.resolve(__dirname, './protos/multi.proto')

test/create.test.js

@@ -1,12 +1,12 @@
-import test from 'ava'
-import path from 'path'
-import grpc from 'grpc'
-import hl from 'highland'
-import async from 'async'
-import _ from 'lodash'
-
-import Mali from '../'
-import * as tu from './util'
+const test = require('ava')
+const path = require('path')
+const grpc = require('grpc')
+const hl = require('highland')
+const async = require('async')
+const _ = require('lodash')
+
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 const CallType = require('@malijs/call-types')

test/errors.test.js

@@ -1,12 +1,12 @@
-import test from 'ava'
-import path from 'path'
-import grpc from 'grpc'
-import hl from 'highland'
-import async from 'async'
-import _ from 'lodash'
-
-import Mali from '../'
-import * as tu from './util'
+const test = require('ava')
+const path = require('path')
+const grpc = require('grpc')
+const hl = require('highland')
+const async = require('async')
+const _ = require('lodash')
+
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 

test/metadata.test.js

@@ -1,16 +1,17 @@
-import test from 'ava'
-import path from 'path'
-import grpc from 'grpc'
-import BB from 'bluebird'
-import pMap from 'p-map'
-import _ from 'lodash'
+const test = require('ava')
+const path = require('path')
+const grpc = require('grpc')
+const util = require('util')
+const pMap = require('p-map')
+const _ = require('lodash')
+const fs = require('fs')
 
-import Mali from '../'
-import * as tu from './util'
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 
-const fs = BB.promisifyAll(require('fs'))
+const readFileAsync = util.promisify(fs.readFile)
 
 const PROTO_PATH = path.resolve(__dirname, './protos/transform.proto')
 
@@ -58,7 +59,7 @@ async function mw1 (ctx, next) {
 
 async function mw2 (ctx, next) {
   const filepath = path.resolve(__dirname, './static/mw2.txt')
-  const v = await fs.readFileAsync(filepath, 'utf8')
+  const v = await readFileAsync(filepath, 'utf8')
   ctx.value = v ? v.trim() : ''
   ctx.mw = (ctx.mw || '').concat(':mw2')
   await next()

test/middleware.test.js

@@ -1,11 +1,11 @@
-import test from 'ava'
-import { AssertionError } from 'assert'
-import { stderr } from 'test-console'
-import path from 'path'
-import grpc from 'grpc'
+const test = require('ava')
+const { AssertionError } = require('assert')
+const { stderr } = require('test-console')
+const path = require('path')
+const grpc = require('grpc')
 
-import Mali from '../'
-import * as tu from './util'
+const Mali = require('../')
+const tu = require('./util')
 
 const pl = require('@grpc/proto-loader')
 
@@ -15,7 +15,7 @@ test('should throw an error if a non-error is given', t => {
 
   const error = t.throws(() => {
     app.onerror('foo')
-  }, AssertionError)
+  }, { instanceOf: AssertionError })
 
   t.is(error.message, 'non-error thrown: foo')
 })