Skip to content

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.
Commits on Apr 19, 2011
@dchelimsky dchelimsky reinstate cucumber and aruba ce11e75
Commits on Apr 20, 2011
@dchelimsky dchelimsky doc updates f11203d
@dchelimsky dchelimsky minor refactorings 79cf9aa
Commits on Apr 23, 2011
@kaiwren kaiwren Support multiple calls to any_instance in the same example.
- Closes #54.
Commits on Apr 27, 2011
@aakashd aakashd adding idea files to ignore list d228f34
Commits on Apr 30, 2011
@dchelimsky dchelimsky prep for 2.6.0.rc3 b023531
Commits on May 01, 2011
@dchelimsky dchelimsky bump to 2.6.0.rc4 0d05d6c
@kaiwren kaiwren Merge branch 'master' of e70e741
Commits on May 06, 2011
@dchelimsky dchelimsky prep for 2.6.0.rc5 4a02ebc
@dchelimsky dchelimsky prep for rc6 ba78f90
Commits on May 12, 2011
@dchelimsky dchelimsky prep for 2.6.0 3f1d77f
Commits on May 21, 2011
@dchelimsky dchelimsky ci: relax rake version constraint 3aa7c98
Commits on May 22, 2011
@justinko justinko Refactor any_instance to be instance agnostic - Closes #58 8e8e62f
@justinko justinko Merge branch 'any_instance' 09e53d2
Commits on May 25, 2011
@justinko justinko ew no more hashitis 7b4fe58
@justinko justinko more cleanup f8ba23d
@justinko justinko cleanup f492200
@justinko justinko more cleanup 1da7c41
@justinko justinko More module scoping for Ruby 1.9.1 e21b5d1
Commits on May 27, 2011
@justinko justinko Support for passing a hash to stub for any_instance. Closes #61 a0c14c9
@justinko justinko changelog 150a933
@justinko justinko combine invocation orders 0e17c96
Commits on May 28, 2011
@justinko justinko Use stub, not stub! f523e3c
@dchelimsky dchelimsky dev: add task to remove generated rbc files bcb76da
@dchelimsky dchelimsky bump to rake 0.9 af5a421
@dchelimsky dchelimsky could just use Ruby (thx mat813) a8ea8c6
Commits on May 30, 2011
@justinko justinko spec to verify that an expectation on a method with a default argumen…
…t outputs the correct message.

Closes #62
Commits on May 31, 2011
@justinko justinko Restore @kaiwren any_instance implementation. 628eb91
@kaiwren kaiwren Merge branch 'master' of git:// de93b40
@kaiwren kaiwren split any_instance into multiple files and get to a green build as pr…
…ep to replicate issue #58
@kaiwren kaiwren Added specs replicating issue #58 27367ce
@dchelimsky dchelimsky dev: constrain cucumber to 0.10.2 since 0.10.3 included breaking changes aff2f95
Commits on Jun 02, 2011
@dchelimsky dchelimsky relish docs e8994a7
Commits on Jun 08, 2011
@kaiwren kaiwren Looks like we've got issue #58 solved except the tests don't match th…
…e exception raised
Commits on Jun 10, 2011
@Mik-die Mik-die fixed bug, when respond_to? returns true for method :to_ary, and then…
…, when this method calls, raise NoMethodError. For example, at this point:
@Mik-die Mik-die Mock doesn't respond to :to_ary 918c32f
Commits on Jun 11, 2011
@justinko justinko Merge pull request #63 from Mik-die/patch-1
respond_to? returns true for :to_ary, but call of :to_ary raises NoMethodError
@justinko justinko Don't need "be_" e64fad4
@justinko justinko changelog 4e28546
@dchelimsky dchelimsky ignore .rbc files 0fd2662
@dchelimsky dchelimsky dev: lock gem versions - rake-0.9.2, aruba-0.3.6 c76eb8a
@dchelimsky dchelimsky ci: tell travis to run bin/rake acb2f54
@dchelimsky dchelimsky dev:clean up Rakefile 0e88ecf
@dchelimsky dchelimsky dev: ficks taipoh e96faf3
@dchelimsky dchelimsky dev: add rdoc to Gemfile 41e56e3
@dchelimsky dchelimsky dev: lock the gherkin version 6f75d7f
@dchelimsky dchelimsky dev: remove dep on rdoc 2c55d9a
@dchelimsky dchelimsky dev: git ignore yard artifacts 103238d
@dchelimsky dchelimsky update binstubs 29f470e
Commits on Jun 12, 2011
@kaiwren kaiwren Merge to master 8f16765
Commits on Jun 13, 2011
@myronmarston myronmarston Use a better method of detecting psych.
The psych/syck specs were failing on 1.9.1 on travis ci.  You can compile ruby with the libyaml option but not actually have psych compiled in, apparently.
@dchelimsky dchelimsky dev: remove autotest/discover 7f0448e
@dchelimsky dchelimsky dev: remove executables from gemspec 42b2edf
@dchelimsky dchelimsky dev: constrain file list in gemspec 7dd57f4
Commits on Jun 17, 2011
@alindeman alindeman [#58] Ignore the fact that should_receive expectations will fail to b…
…e satisfied in tests that raise errors earlier
@kaiwren kaiwren Merge pull request #4 from alindeman/issue58
Ignore the fact that should_receive expectations will fail to be satisfied in tests that raise errors earlier
@kaiwren kaiwren Merge branch 'issue58' of into …
@kaiwren kaiwren Fixed broken feature related to multiple method stubs and added anoth…
…er for any_instance.stub.with - this should close Issue #58
Commits on Jun 19, 2011
@justinko justinko Merge pull request #65 from c42engineering/issue58
Support for any_instance argument matching. Closes #58
@justinko justinko changelog b970638
Commits on Jun 21, 2011
@dchelimsky dchelimsky ci: exclude local dev gems from travis bundle b9991bd
@dchelimsky dchelimsky dev: bump aruba timeout to 5 seconds f5b226f
@dchelimsky dchelimsky ruby-1.9.1: use fully qualified names in specs c77dbeb
@dchelimsky dchelimsky dev: remove bin dir from git fae8749
Commits on Jun 23, 2011
@dchelimsky dchelimsky bump cukes to 1.0 b6d93c5
@dchelimsky dchelimsky dev: constrain rcov to ruby 1.8 builds 54ec0a1
Commits on Jun 28, 2011
Tibor Claassen Check for #failure_message_for_should or #failure_message instead of …
…#description to detect a matcher.

- #description optional for a matcher and common in other domains
- one of #failure_message_for_should or #failure_message is mandatory
  - #failure_message is acceptable for backward compatibility
- Closes #64
@dchelimsky dchelimsky Changelog 0e482f4
@dchelimsky dchelimsky move Changelog to project root 153d051
Commits on Jul 02, 2011
@dchelimsky dchelimsky dev: reduce warnings aca59bc
@dchelimsky dchelimsky reduce warnings generated by rspec-mocks f04b8bb
Commits on Jul 19, 2011
@kaiwren kaiwren Fixing #67 - unstub support for any_instance 0a7cde5
Commits on Jul 20, 2011
@justinko justinko Merge pull request #68 from c42engineering/Issue67
Fixing #67 - unstub support for any_instance
Commits on Aug 14, 2011
@kaiwren kaiwren Issue #70 add support for #stub_chain to any_instance c6af9f9
@justinko justinko Merge pull request #71 from c42engineering/issue70
Issue #70: add support for #stub_chain to any_instance
@justinko justinko changelog 82e4ff9
Commits on Aug 19, 2011
@alextk alextk use __send__ method instead of send method, to cover cases when targe…
…t object send method is overridden to expose business api
@justinko justinko Merge pull request #74 from alextk/master
Use __send__ method instead of send
@justinko justinko changelog 63ed352
Commits on Aug 20, 2011
@booch booch document stubbing methods with method names and return values passed …
…as a hash
Commits on Aug 24, 2011
@dchelimsky dchelimsky Merge pull request #75 from booch/master
Document stubbing with methods / return values passed as a hash
@dchelimsky dchelimsky doc tweaks/clarification cfa7a96
Commits on Aug 26, 2011
@adomokos adomokos Add new feature for receive_counts on mocks 52daacc
Commits on Sep 02, 2011
@adomokos adomokos Removing incorrect description 14c52b9
@adomokos adomokos Adding new feature - stubbing with arguments 45b3872
@jredville jredville add argument_matchers features for explicit arguments, anything, any_…
…args, and no_args
@jredville jredville Merge branch 'master' of b08c75e
Commits on Sep 03, 2011
@dchelimsky dchelimsky Merge pull request #77 from adomokos/add_receive_count_feature
Add new feature for receive_counts on mocks
Commits on Sep 29, 2011
@dchelimsky dchelimsky improve explanation as to why we raise NoMethodError on to_ary b0ea68d
@dchelimsky dchelimsky ci: stick to rubies supported by travis 66d5295
Commits on Oct 09, 2011
@dchelimsky dchelimsky Merge pull request #80 from adomokos/add_stub_with_arguments_feature
Adding new cuke feature - stubbing with arguments
@dchelimsky dchelimsky Tweak the "stub with arguments" cuke
- #80.
@dchelimsky dchelimsky Merge pull request #81 from jredville/master
add argument_matchers features for explicit arguments, anything, any_args, and no_args
@dchelimsky dchelimsky nav for new features 1018eaf
@dchelimsky dchelimsky this has been moved to features/argument_matchers 3e1bbba
@dchelimsky dchelimsky bump to 2.7.0.rc1 3934ef4
@dchelimsky dchelimsky bump relish version to ~> 0.5.0 1c128a3
@dchelimsky dchelimsky dev: fix relish task 2f7706a
@dchelimsky dchelimsky fix link to full changelog 53b7427
Commits on Oct 12, 2011
@dchelimsky dchelimsky Raise a helpful message on any_instance.stub! (use stub instead)
- Closes #57.
@dchelimsky dchelimsky rdoc tweaks f0f9d4a
Commits on Oct 15, 2011
@kaiwren kaiwren Bug fix: any_instance now properly restores private methods
- Closes #86.
- Fixes #85.
@dchelimsky dchelimsky Changlog for #85 and #86. b3832f5
Commits on Oct 16, 2011
@dchelimsky dchelimsky cleanup and add some rdoc f646743
@dchelimsky dchelimsky update changelog for 2.7.0 release 6a7c51a
@dchelimsky dchelimsky bump version to 2.7.0 19b5646
@dchelimsky dchelimsky fix formatting problems in the changelog fdd3602
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
@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
@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.
@dchelimsky dchelimsky silly cut/paste 1f3a352
@dchelimsky dchelimsky rdoc: test to see if github markup works as expected on 75fb857
@dchelimsky dchelimsky restore rdoc examples to standard markdown indentation until rdoc.inf…
…o supports git-flavored markup
Commits on Nov 29, 2011
@dchelimsky dchelimsky rdoc: AnyInstance::Chain DSL methods (thanks to Loren Segal for the y…
…ard tip)
@dchelimsky dchelimsky rdoc: add @see tags to AnyInstance::Chain methods b147e12
@dchelimsky dchelimsky more rdoc - trying out GFM on 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
@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.
@pat pat Following Kernel.throw's method signature
First argument is the symbol, second is the optional object that is returned.
@dchelimsky dchelimsky Merge pull request #90 from freelancing-god/throw-with-params
Throwing with parameters
@dchelimsky dchelimsky align the examples for and_throw
- #90
@dchelimsky dchelimsky fix warnings
- #90
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:

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

Better message if #and_raise exception type requires constructor params

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

- #99, #100.
@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
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
@dchelimsky dchelimsky Simplify some examples.
- #105.
@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
@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…
@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)
@dchelimsky dchelimsky Changelog for #109 59c41e8
@dchelimsky dchelimsky minor refactoring: rename args_expectation to argument_expectation (i…
@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
@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.
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