Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rspec/rspec-mocks
...
head fork: rspec/rspec-mocks
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Nov 13, 2012
@alindeman alindeman Fixes changes link c1af6e8
Commits on Nov 25, 2012
@myronmarston myronmarston Fig line arg passed to class_eval so that it's correct.
There contents of the heredoc starts on the next line, hence the need for `+ 1`.
8b8d801
@myronmarston myronmarston Fix broken link. 0d6eea7
@myronmarston myronmarston Add support for #and_call_original to an #any_instance partial mock.
Fixes #197.
0f77e46
@myronmarston myronmarston Add explanatory comments for my last commit. d2ef056
@myronmarston myronmarston Handle additional any_instance / and_call_original edge cases.
For #197.
148db3c
Commits on Dec 03, 2012
@myronmarston myronmarston Fix stub_const/hide_const to work properly with a const like "::Foo".
It didn't work properly with names containing leading '::' before.

Fixes #200.
17daf44
Commits on Dec 10, 2012
@sanemat sanemat Use Kernel#inspect instead of #to_s
Kernel#inspect does not call #to_s anymore, on Ruby2.0.0
394c14a
@myronmarston myronmarston Merge pull request #204 from sanemat/fix/class-name
Use Kernel#inspect instead of #to_s
a209077
Commits on Dec 16, 2012
@myronmarston myronmarston Run travis builds against ruby 2.0. 2dcfb20
Commits on Dec 19, 2012
@myronmarston myronmarston Improve the way we run builds.
- No need for `find_path_to_rspec_exe`; I've discovered that `--standalone`
  and `--binstubs` together produce bins that don't load bundler.
- Add `-x` to `set -e` as that will cause the script to print each command
  as it runs.  No need for `print_and_run`.
- Add cucumber to test_all script, and use just that for the build.
63ae97f
Commits on Dec 20, 2012
@myronmarston myronmarston Stash and restore aliased methods when the owner is reported wrong.
Fixes #206.

While I was at it, I wanted to verify that `and_call_original` works
with this case, so I added a spec for it, too.
f86d02c
@alindeman alindeman Merge pull request #207 from rspec/handle_aliased_methods
Stash and restore aliased methods when the owner is reported wrong.
ac90673
Commits on Dec 21, 2012
@myronmarston myronmarston Update Changelog. 5e41915
@myronmarston myronmarston Release 2.12.1. d7aac2c
@myronmarston myronmarston 1 more changelog entry I forgot.
[ci skip]
1ee14fc
Commits on Dec 26, 2012
@myronmarston myronmarston Cleanup whitespace. 11cccc4
@myronmarston myronmarston Simplify implementation of `and_raise`.
It can use an implementation block rather than needing to
maintain some extra state.
d9a7e36
@myronmarston myronmarston Simplify implementation of `and_throw`.
It can use an implementation block rather than needing to
maintain some extra state.
16d30dc
@myronmarston myronmarston Don't assume presence of rspec-core's `warn_deprecation` method.
rspec-mocks should be usable outside of rspec-core.
363406a
@myronmarston myronmarston Deprecate `spec/mocks` file (for rspec-1 compatibility). f9c5d6a
Commits on Dec 31, 2012
@myronmarston myronmarston Cleanup whitespace. eb6e30f
@myronmarston myronmarston Add missing require. 0db78bc
@myronmarston myronmarston Switch to new expect syntax. e5f11d7
Commits on Jan 01, 2013
@myronmarston myronmarston Convert one more example I missed to `expect` syntax.
This one isn't run on 1.8.7 (the version I was using
last night when doing the conversion).
352870a
@alindeman alindeman Merge pull request #208 from rspec/new_expect_syntax
Switch to new expect syntax.
dd06392
Commits on Jan 04, 2013
@alindeman alindeman Adds failing spec demonstrating #210 8825ed3
@alindeman alindeman Adds a candidate fix for #210 763dda3
Commits on Jan 05, 2013
@myronmarston myronmarston Ignore .rspec-local. 6356c92
@myronmarston myronmarston Fix `and_call_original` so that it looks for the method in all ancestors
...including those mixed into the singleton class (i.e.
via a module extended onto an object instance).

Fixes #212.
14ae958
@myronmarston myronmarston Merge pull request #213 from rspec/issue-212
Fix `and_call_original` so that it looks for the method in all ancestors
80899f0
Commits on Jan 07, 2013
@alindeman alindeman Cleans up the implementation after feedback from @myronmarston e3ab91c
@myronmarston myronmarston Merge pull request #211 from rspec/issue_210
Adds failing spec demonstrating #210
a0c8217
Commits on Jan 28, 2013
@myronmarston myronmarston Fix doc string typos.
[ci skip]
57543ba
@myronmarston myronmarston Handle `stub_const("::SomeUndefinedConst")`.
I thought I fixed the problem in 17daf44,
but I missed this edge case.  That only fixed `stub_const("::SomeDefinedConst").

Fixes #200.
1e3f431
@myronmarston myronmarston 2.12.2 release. bde69f0
Commits on Feb 02, 2013
@myronmarston myronmarston Add failing spec for #219. 06b7763