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 Oct 25, 2011
@justinko justinko Set default order to :random c3728d5
Commits on Oct 29, 2011
@mvz mvz Turn on warnings for spec task. 96640b0
@mvz mvz Fix 'assigned but unused variable' warnings in lib. 63fb2bc
@mvz mvz Fix 'assigned but unused variable' warnings in spec. c3c8a97
Commits on Oct 30, 2011
@dchelimsky dchelimsky Merge pull request #88 from mvz/no-warnings
Fix warnings
a02c59b
@dchelimsky dchelimsky dev: fix ruby-debug version (and deps) for 1.9.2 aabc5af
@dchelimsky dchelimsky changelog for #88 32f635f
@dchelimsky dchelimsky changelog tweaks 5244b17
Commits on Nov 06, 2011
@dchelimsky dchelimsky changelog 349f127
@dchelimsky dchelimsky bump to 2.8.0.rc1 7fa5ae6
Commits on Nov 09, 2011
@dchelimsky dchelimsky update License and/or authors in gemspec 6bcdd5c
@dchelimsky dchelimsky update email addy and homepage in gemspec 8dfe521
@dchelimsky dchelimsky only extend Object and Class once 7bd33e2
@dchelimsky dchelimsky move overview to Readme (where it belongs) c186d12
@dchelimsky dchelimsky eliminate warning aeaed20
@dchelimsky dchelimsky rdoc 7348985
@dchelimsky dchelimsky rename file to match module name 000b281
@dchelimsky dchelimsky more README 0a824d2
@dchelimsky dchelimsky fix changelog formatting 15199b8
Commits on Nov 25, 2011
@dchelimsky dchelimsky dev: hack the Gemfile to print instructions for ruby-debug-base19 and…
… linecache19 on ruby-1.9.3
bcbe4c6
@dchelimsky dchelimsky ci: don't warn about ruby-debug-base19 and linecache19 in ci 4273029
@dchelimsky dchelimsky dev: just use the latest rake dd109db
@dchelimsky dchelimsky doc: clean up .yardopts 01c11ee
@dchelimsky dchelimsky rdoc (and a rename or two) f4bd883
@dchelimsky dchelimsky gotta use _some_ rake though b6eb554
Commits on Nov 26, 2011
@dchelimsky dchelimsky dev: move dev-env gems to Gemfile-custom.sample a1baff8
@dchelimsky dchelimsky dev: store the sample, not the actual file 8f9b53d
@dchelimsky dchelimsky add DEV-README bb606af
@dchelimsky dchelimsky rdoc 6d93edd
Commits on Nov 27, 2011
@icambron icambron added ruby syntax highlighting for github a13dd64
@icambron icambron removed extra indentation in readme f86db3e
@dchelimsky dchelimsky Begin to refactor any_instance framework a bit as I wrap my head arou…
…nd it.
c104626
@dchelimsky dchelimsky silly cut/paste 1f3a352
@dchelimsky dchelimsky rdoc: test to see if github markup works as expected on rdoc.info 75fb857
@dchelimsky dchelimsky restore rdoc examples to standard markdown indentation until rdoc.inf…
…o supports git-flavored markup
dc295d2
Commits on Nov 29, 2011
@dchelimsky dchelimsky rdoc: AnyInstance::Chain DSL methods (thanks to Loren Segal for the y…
…ard tip)
59b73a8
@dchelimsky dchelimsky rdoc: add @see tags to AnyInstance::Chain methods b147e12
@dchelimsky dchelimsky more rdoc - trying out GFM on rdoc.info again 8f8fa3d
@dchelimsky dchelimsky no go on GFM for now de90662
@dchelimsky dchelimsky rdoc: maybe GFM works for .md files but not .rb files? 2bc29ca
@dchelimsky dchelimsky rdoc: undo GFM again 64b1483
@dchelimsky dchelimsky rdoc: some message expectation methods db61d60
@dchelimsky dchelimsky rdoc: remaining MessageExpectation methods 382fadb
@dchelimsky dchelimsky rdoc: add GFM test file (temp) dc8aba1
@dchelimsky dchelimsky need to include it in .yardopts, silly 39e227a
@dchelimsky dchelimsky clean up ArgumentMatchers b701d0f
@dchelimsky dchelimsky rdoc 45b6314
Commits on Nov 30, 2011
@dchelimsky dchelimsky rdoc - mostly hiding noise end-users don't care about 8ddbed7
@dchelimsky dchelimsky Merge pull request #89 from icambron/doc_changes
Use github-flavored-markdown for the README
3e89723
@dchelimsky dchelimsky don't need the GFM test any longer (it works now) c758d40
@dchelimsky dchelimsky rdoc: legal ruby in the comments actually works 50a4980
Commits on Dec 02, 2011
@dchelimsky dchelimsky add license to gemspec (and consequently the gem) 8e60983
Commits on Dec 04, 2011
@dchelimsky dchelimsky don't need redcarpet in the .yardopts since yard 0.7.4 5424a5c
Commits on Dec 05, 2011
@dchelimsky dchelimsky fix ruby parsing error in rdoc 26d3ffb
Commits on Dec 06, 2011
@pat pat Throwing with parameters
This is written so I can stub out Warden's behaviour appropriately - and I realise it's simple, but perhaps this is all that's needed. It certainly works for me.
aca77b2
@pat pat Following Kernel.throw's method signature
First argument is the symbol, second is the optional object that is returned.
d0c805e
@dchelimsky dchelimsky Merge pull request #90 from freelancing-god/throw-with-params
Throwing with parameters
c03c8d6
@dchelimsky dchelimsky align the examples for and_throw
- #90
8c6ffba
@dchelimsky dchelimsky fix warnings
- #90
4543082
Commits on Dec 20, 2011
@dchelimsky dchelimsky prep for 2.8.0.rc2 12506e1
Commits on Jan 05, 2012
@dchelimsky dchelimsky bump to 2.8.0 ea8cc1f
Commits on Jan 26, 2012
@justinko justinko Allow a `as_null_object` to be passed to `with`. Closes #98 de283b3
Commits on Jan 29, 2012
@coreyhaines coreyhaines Better message if #and_raise exception type requires constructor params 6fe4168
@coreyhaines coreyhaines Make name of sample exception a bit more clear as to its purpose b92f2cc
Commits on Jan 30, 2012
@justinko justinko Don't hit `__mock_proxy` unless you need to. This avoids a Rubby 1.8.…
…7 Proc equality bug: https://gist.github.com/1702877

This commit fixes the build for 1.8.7
9a201da
@dchelimsky dchelimsky Merge pull request #100 from coreyhaines/and_raise_big_arity_construc…
…tor_better_message

Better message if #and_raise exception type requires constructor params

- Fixes #99.
7ce8c6f
@dchelimsky dchelimsky More detailed error message when and_raise gets a class whose constru…
…ctor requires 1 or more args.

- #99, #100.
1f28dcd
@dchelimsky dchelimsky clean up some specs 5897343
Commits on Feb 02, 2012
@nruth nruth Use the null object, rather than re-assigning another double 9a095fb
Commits on Feb 03, 2012
@dchelimsky dchelimsky Merge pull request #104 from nruth/patch-1
Use the null object, rather than re-assigning another double
f999770
Commits on Feb 04, 2012
@aubreyrhodes aubreyrhodes Fixing blocks not being passed to stubs f0c7643
Commits on Feb 05, 2012
@dchelimsky dchelimsky Merge pull request #105 from aubreyrhodes/fix_stub_not_passing_block
Fixing blocks not being passed to stubs
42b3ef7
@dchelimsky dchelimsky Simplify some examples.
- #105.
0b4eab2
@dchelimsky dchelimsky Changelog for #105 6743cd7
Commits on Feb 08, 2012
@preethiramdev preethiramdev Making ordering common to all object per spec 221594b
@preethiramdev preethiramdev Adding spec to test the ordering is reset each time c59981d
@dchelimsky dchelimsky Merge pull request #106 from preethiramdev/issue-101
Support order constraints across objects
b4e6746
@dchelimsky dchelimsky Changelog for #101, #106 35f67e6
@dchelimsky dchelimsky dev: restore random ordering 0ce8c71
@dchelimsky dchelimsky clean up order constraint spec 3f94b50
@dchelimsky dchelimsky clear expectation_ordering rather than creating a new one for each ex…
…ample
c8b9948
@dchelimsky dchelimsky some mocks are not mocks 17c259e
Commits on Feb 09, 2012
@dchelimsky dchelimsky refactoring: those syms are messages dce2d2c
Commits on Feb 11, 2012
@justinko justinko No need to require yaml. 56a5ccd
Commits on Feb 17, 2012
@preethiramdev preethiramdev Initializing message expectation args to match any args 917dca2
@dchelimsky dchelimsky Merge pull request #109 from c42engineering/expectation_args
Initialize child message expectation args to match any args (See #103)
408a09c
@dchelimsky dchelimsky Changelog for #109 59c41e8
@dchelimsky dchelimsky minor refactoring: rename args_expectation to argument_expectation (i…
…nternal)
4c32db1
@dchelimsky dchelimsky clean up and enhance spec for mixing stubs and expectations 117f2cb
Commits on Feb 20, 2012
@preethiramdev preethiramdev should receiving stubbed atleast_once removes matching stub 235c8cc
Commits on Feb 24, 2012
@preethiramdev preethiramdev Fixing method called on nil warning 251bf2a
@dchelimsky dchelimsky Merge pull request #110 from c42engineering/issue-103
should_receive(:x).at_least_once clears any stubs on :x

- Fixes #103
6e23ca9
@dchelimsky dchelimsky Revert "Merge pull request #110 from c42engineering/issue-103"
Turns out this change is significantly backward-incompatible that we're
going to have to wait for rspec-mocks-3 to release it (or similar)

This reverts commit 6e23ca9, reversing
changes made to 117f2cb.
3bb19cb
Commits on Feb 27, 2012
@dchelimsky dchelimsky check if @_null_object is defined to avoid warning when it is not 185d47e
Commits on Mar 12, 2012
@dchelimsky dchelimsky bump to 2.9.0.rc1 c83ae1c
@dchelimsky dchelimsky restore some gems to Gemfile e7d92e4
@dchelimsky dchelimsky ci: don't need to exclude development env any longer 377c32b
@dchelimsky dchelimsky align gemspec with other rspec libs 21d21ce
@dchelimsky dchelimsky bump to 2.9.0.rc2 06ce1ab