Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support Jest 25 v2 #1355

Merged
merged 11 commits into from Jan 23, 2020
Merged

feat: support Jest 25 v2 #1355

merged 11 commits into from Jan 23, 2020

Commits on Sep 17, 2019

  1. feat: support Jest 25

    @sodatea
    sodatea committed Sep 17, 2019
    Copy the full SHA
    ffc2cfe View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2019

  1. chore: update dependencies

    @sodatea
    sodatea committed Sep 25, 2019
    Copy the full SHA
    10507d2 View commit details
    Browse the repository at this point in the history

  2. test: update test files to use jest 25

    @sodatea
    sodatea committed Sep 25, 2019
    Copy the full SHA
    255a7c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2019

  1. Merge branch 'master' into jest25

    @kulshekhar
    kulshekhar committed Sep 26, 2019
    Copy the full SHA
    111b305 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Merge branch 'master' of https://github.com/kibertoad/ts-jest into je… 

    …st25

� Conflicts:
�	e2e/__templates__/default/package-lock.json
�	e2e/__templates__/default/package.json
�	e2e/__templates__/with-babel-7/package-lock.json
�	e2e/__templates__/with-babel-7/package.json
�	e2e/__templates__/with-typescript-2-7/package-lock.json
�	e2e/__templates__/with-typescript-2-7/package.json
�	e2e/__templates__/with-unsupported-version/package-lock.json
�	e2e/__templates__/with-unsupported-version/package.json
�	package-lock.json
    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    308fb72 View commit details
    Browse the repository at this point in the history

  2. chore: Resolve conflicts

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    ed52e58 View commit details
    Browse the repository at this point in the history

  3. fix: Try to fix snapshots

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    ea0ea50 View commit details
    Browse the repository at this point in the history

  4. fix: Try to fix snapshots v2

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    82445bb View commit details
    Browse the repository at this point in the history

  5. chore: Fix version checks

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    a644574 View commit details
    Browse the repository at this point in the history

  6. chore: Fix tests for version checks

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    9dc14f2 View commit details
    Browse the repository at this point in the history

  7. fix: Fix tests for version checks v2

    Igor Savin committed Jan 22, 2020
    Copy the full SHA
    154f1d6 View commit details
    Browse the repository at this point in the history