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

Correctly merge property matchers with the rest of the snapshot in toMatchSnapshot. #6528

Merged
merged 12 commits into from
Aug 9, 2018
Merged

Correctly merge property matchers with the rest of the snapshot in toMatchSnapshot. #6528

merged 12 commits into from
Aug 9, 2018

Commits on Jun 23, 2018

  1. deep merge property matchers in snapshot objects

    @swcisel
    swcisel committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    a88a7c0 View commit details
    Browse the repository at this point in the history

  2. Update index.js 

    correct typo variable name in deepMerge
    @swcisel
    swcisel authored Jun 23, 2018
    Configuration menu
    Copy the full SHA
    994e09e View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @swcisel
    swcisel authored Jun 23, 2018
    Configuration menu
    Copy the full SHA
    cbf8f6b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2018

  1. moved deepMerge to jest-snapshot utils.

    @swcisel
    swcisel committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    7ac7f4d View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Merge remote-tracking branch 'origin/master' into full_snapshot_with_… 

    …property_matcher-2
    @rickhanlonii
    rickhanlonii committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    a3b32ed View commit details
    Browse the repository at this point in the history

  2. Update changelog

    @rickhanlonii
    rickhanlonii committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    74796b0 View commit details
    Browse the repository at this point in the history

  3. Update deepmerge tests

    @rickhanlonii
    rickhanlonii committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    d17e7f6 View commit details
    Browse the repository at this point in the history

  4. Add errors for invalid property matchers

    @rickhanlonii
    rickhanlonii committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    1b8dd70 View commit details
    Browse the repository at this point in the history

  5. Update changelog

    @rickhanlonii
    rickhanlonii committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    deb016c View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Merge branch 'master' into full_snapshot_with_property_matcher

    @SimenB
    SimenB authored Jul 16, 2018
    Configuration menu
    Copy the full SHA
    7032a35 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2018

  1. Merge branch 'master' into full_snapshot_with_property_matcher

    @thymikee
    thymikee authored Aug 8, 2018
    Configuration menu
    Copy the full SHA
    e4fbf98 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2018

  1. Merge branch 'master' into full_snapshot_with_property_matcher

    @thymikee
    thymikee authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    3902a22 View commit details
    Browse the repository at this point in the history