Skip to content

Commit

Permalink
Merge pull request #957 from thymikee/feat/jest24
Browse files Browse the repository at this point in the history
feat(jest): bump to 24
  • Loading branch information
kulshekhar committed Feb 18, 2019
2 parents fb53685 + 0a2f533 commit 61d31b4
Show file tree
Hide file tree
Showing 48 changed files with 6,938 additions and 23,138 deletions.
2 changes: 1 addition & 1 deletion e2e/__cases__/deep/src/Button/click.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as mod from './mod'
import mod from './mod'

export function click(foo: string) {
return `clicked ${mod(foo)}`
Expand Down
2 changes: 2 additions & 0 deletions e2e/__cases__/deep/src/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"forceConsistentCasingInFileNames": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"strict": true
}
}
2 changes: 1 addition & 1 deletion e2e/__cases__/module-kinds/ts-jest-tools.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as presets from 'ts-jest/presets'
import * as utils from 'ts-jest/utils'

test('presets', () => {
const presetKeys = ['transform', 'testMatch', 'moduleFileExtensions']
const presetKeys = ['transform']
expect(Object.keys(presets.defaults)).toEqual(presetKeys)
expect(presets.defaults).toEqual(require('ts-jest/presets/default/jest-preset'))
expect(presets.defaults).toEqual(require('ts-jest/jest-preset'))
Expand Down
17 changes: 2 additions & 15 deletions e2e/__helpers__/templates.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
export enum PackageSets {
default = 'default',
babel6 = 'with-babel-6',
babel7 = 'with-babel-7',
jest22 = 'with-jest-22',
typescript2_7 = 'with-typescript-2-7',
// invalid
unsupportedVersion = 'with-unsupported-version',
}
export const allValidPackageSets = [
PackageSets.default,
PackageSets.babel6,
PackageSets.babel7,
PackageSets.jest22,
PackageSets.typescript2_7,
]
export const allPackageSetsWithPreset = [
PackageSets.default,
PackageSets.babel6,
PackageSets.babel7,
PackageSets.typescript2_7,
]
export const allValidPackageSets = [PackageSets.default, PackageSets.babel7, PackageSets.typescript2_7]
export const allPackageSetsWithPreset = [PackageSets.default, PackageSets.babel7, PackageSets.typescript2_7]
Loading

0 comments on commit 61d31b4

Please sign in to comment.