Fix hash_including for rspec 1 #320

Merged
merged 2 commits into from Oct 29, 2013

Conversation

Projects
None yet
4 participants
@tamird
Contributor

tamird commented Oct 27, 2013

Alternative approach to #319 -- prevents webmock from overwriting hash_including from rspec. Fixes an edge case where a splat of solitary keys is passed to the method when using rspec 1.3.2.

@strongriley

This comment has been minimized.

Show comment
Hide comment
@strongriley

strongriley Oct 28, 2013

Thanks @tamird - this seems like a better approach. Closing mine. @bblimke does this look good to you?

Thanks @tamird - this seems like a better approach. Closing mine. @bblimke does this look good to you?

@tamird

This comment has been minimized.

Show comment
Hide comment
@tamird

tamird Oct 28, 2013

Contributor

@bblimke updated this pull to be less dependent on conditions at load-time. This should make it more resilient in the case where webmock is loaded, then rspec is loaded, then rspec is mixed in, and finally webmock is mixed in (the rspec implementation will still be used, now).

WDYT?

Contributor

tamird commented Oct 28, 2013

@bblimke updated this pull to be less dependent on conditions at load-time. This should make it more resilient in the case where webmock is loaded, then rspec is loaded, then rspec is mixed in, and finally webmock is mixed in (the rspec implementation will still be used, now).

WDYT?

@strongriley

This comment has been minimized.

Show comment
Hide comment
@strongriley

strongriley Oct 29, 2013

👍 This seems more robust.

👍 This seems more robust.

@rudle

This comment has been minimized.

Show comment
Hide comment
@rudle

rudle Oct 29, 2013

👍

rudle commented Oct 29, 2013

👍

@bblimke

This comment has been minimized.

Show comment
Hide comment
@bblimke

bblimke Oct 29, 2013

Owner

Clever! :)

Owner

bblimke commented Oct 29, 2013

Clever! :)

bblimke added a commit that referenced this pull request Oct 29, 2013

@bblimke bblimke merged commit 9ec2fb1 into bblimke:master Oct 29, 2013

1 check passed

default The Travis CI build passed
Details

@tamird tamird deleted the tamird:fix-hash_including branch Oct 29, 2013

@tamird

This comment has been minimized.

Show comment
Hide comment
@tamird

tamird Oct 29, 2013

Contributor

@bblimke thanks! would you mind cutting a release including this fix?

Contributor

tamird commented Oct 29, 2013

@bblimke thanks! would you mind cutting a release including this fix?

@bblimke

This comment has been minimized.

Show comment
Hide comment
@bblimke

bblimke Oct 29, 2013

Owner

Released as 1.15.1. Thank you!

Owner

bblimke commented Oct 29, 2013

Released as 1.15.1. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment