Update to support ava 0.20+

unional · Jul 23, 2017 · 6a869d7 · 6a869d7
1 parent 2eeaeed
commit 6a869d7
Show file tree

Hide file tree

Showing 9 changed files with 4,287 additions and 2,307 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,15 +66,15 @@
   },
   "peerDependencies": {
     "aurelia-logging": ">=1.2.0",
-    "ava": ">=0.19.1"
+    "ava": ">=0.20"
   },
   "devDependencies": {
     "@types/mkdirp": "^0.5.0",
-    "@types/node": "^8.0.4",
+    "@types/node": "^8.0.15",
     "assert-order": "^2.3.1",
     "aurelia-logging": "^1.3.1",
     "aurelia-logging-color": "^0.5.5",
-    "aurelia-polyfills": "^1.2.1",
+    "aurelia-polyfills": "^1.2.2",
     "ava": "^0.21.0",
     "bluebird": "^3.5.0",
     "browser-env": "^3.0.0",

diff --git a/src/curryMatch.ts b/src/curryMatch.ts
@@ -1,12 +1,12 @@
 import { getLogger } from 'aurelia-logging'
-import { ContextualTestContext } from 'ava'
+import { Context, TestContext } from 'ava'
 import { compare } from 'dir-compare'
 import { readFileSync, existsSync } from 'fs'
 import { join, relative } from 'path'
 
 const logger = getLogger('fixture')
 
-export function curryMatch(baselinePath: string, resultPath: string, t: ContextualTestContext) {
+export function curryMatch(baselinePath: string, resultPath: string, t: TestContext & Context<any>) {
   // here is ava cwd, which is the project root
   // Use this to do relative() with filename get good relative path.
   const cwd = process.cwd()

diff --git a/src/fixture.ts b/src/fixture.ts
@@ -1,7 +1,8 @@
 import { readdirSync } from 'fs'
 import { resolve, join } from 'path'
 import test, {
-  ContextualTestContext
+  TestContext,
+  Context
 } from 'ava'
 
 import {
@@ -32,7 +33,7 @@ export function fixture(ava: typeof test, casesPath: string, baselinesPath?: str
     return ((
       title: string,
       caseName: string,
-      run: (t: ContextualTestContext, d: ContextualDiffContext) => any
+      run: (t: TestContext & Context<any>, d: ContextualDiffContext) => any
     ) => {
       const hasTitle = !!run
       if (!run) {
@@ -49,7 +50,7 @@ export function fixture(ava: typeof test, casesPath: string, baselinesPath?: str
         d.baselinePath = resolve(baselinesPath, caseName)
         d.resultPath = resolve(resultsPath, caseName)
       }
-      return testfn(`${hasTitle ? title + ' ' : ''}${caseName}`, (t: ContextualTestContext) => {
+      return testfn(`${hasTitle ? title + ' ' : ''}${caseName}`, (t: TestContext & Context<any>) => {
         if (baselinesPath) {
           d.match = curryMatch(d.baselinePath, d.resultPath, t)
         }
@@ -107,7 +108,7 @@ export function fixture(ava: typeof test, casesPath: string, baselinesPath?: str
           d.resultPath = resolve(resultsPath, caseName)
         }
 
-        return testfn(caseName, (t: ContextualTestContext) => {
+        return testfn(caseName, (t: TestContext & Context<any>) => {
           if (baselinesPath) {
             d.match = curryMatch(d.baselinePath, d.resultPath, t)
           }
@@ -159,7 +160,7 @@ export function fixture(ava: typeof test, casesPath: string, baselinesPath?: str
 
   fn.only.failing = fn.failing.only
   fn.only.each = eachCurry(ava.only)
-  fn.only.each.failing = eachCurry(ava.only.failing)
+  fn.only.each.failing = eachCurry(ava.only.failing as any)
 
   fn.skip.failing = fn.failing.skip
   fn.skip.each = eachCurry(ava.skip)

diff --git a/src/interfaces.ts b/src/interfaces.ts
diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -17,8 +17,7 @@
     "noUnusedParameters": true,
     "removeComments": false,
     "sourceMap": true,
-    "strictNullChecks": true,
-    "target": "es5"
+    "strictNullChecks": true
   },
   "files": [
     "src/index.ts"

diff --git a/tsconfig.es2015.json b/tsconfig.es2015.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "module": "es2015",
     "outDir": "dist/es2015",
-    "sourceRoot": "/ava-fixture",
     "target": "es2015"
   }
 }
diff --git a/tsconfig.es5.json b/tsconfig.es5.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "dist/es5",
-    "sourceRoot": "/ava-fixture"
+    "target": "es5",
+    "outDir": "dist/es5"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.es5.json",
   "compilerOptions": {
     "outDir": "dist-spec"
   },