Permalink
Switch branches/tags
Commits on Jun 26, 2013
  1. Reorganize marshal code.

    myronmarston committed Jun 26, 2013
    - This appears to fix rspec/rspec-core#950.
    - It's better, anyway, since it bypasses the unnecessary
      shifting/unshifting for this case.
Commits on Jun 25, 2013
  1. Merge pull request #327 from rspec/features_for_expect_any_instance_o…

    JonRowe committed Jun 25, 2013
    …f_214
    
    Better docs for `expect_any_instance_of` and `allow_any_instance_of`
  2. Merge pull request #312 from rspec/features_for_expect_any_instance_o…

    JonRowe committed Jun 25, 2013
    …f.feature
    
    Need better docs for `expect_any_instance_of` and `allow_any_instance_of`
Commits on Jun 22, 2013
  1. assert upon old syntax too

    JonRowe committed Jun 22, 2013
Commits on Jun 21, 2013
  1. Merge pull request #322 from rspec/refactor_jruby_fix

    JonRowe committed Jun 21, 2013
    Refactor the workaround for JRuby 1.7.4
  2. Merge pull request #317 from rspec/fix_lambdas_for_214

    JonRowe committed Jun 21, 2013
    Allow lambdas to be passed with argument lists that dont match called method signature
Commits on Jun 20, 2013
  1. rename method

    JonRowe committed Jun 20, 2013
  2. Merge pull request #316 from rspec/apply_243_onto_214

    JonRowe committed Jun 20, 2013
    Apply 243 onto 214
  3. Clarify relationship between different method stub actions.

    myronmarston authored and JonRowe committed Mar 12, 2013
    In 2.13.0 only `and_yield` and `and_return` could be combined, since
    that was the only combination case that was specified by an example.
    This was a regression, as reported by a user in #230.
    
    I tried here to fully specify all of the various combinations of stub
    actions. Notes:
    
    * `and_return`, `and_raise` and `and_throw` are "terminal" actions
      in the sense that they terminate the method. They _must_ happen last
      and it is impossible to support more than one of these. Hence, we allow
      only one of these, and allow them to be overridden. We also return `nil`
      from these methods to discourage further stub configuration.
    * `and_call_original` is a special case that doesn't make sense to be
      combined with any of the others. Once you've set it up, this causes
      any further instructions to raise an error.
    * `and_yield` is treated as an "initial" action. Yielding doesn't exit
      a method the way the terminal actions do. It is the only initial action.
      Calling it multiple times sets up multiple yields.
    * Setting a block implementation (possible by passing a block to almost
      any method on the fluent interface) sets the block as the "inner" action.
      It runs between the configured yields (if there are any) and the configured
      terminal action (if there is one). My thinking here is that in many cases,
      users use a block implementation to specify a return value, essentially
      making it like a terminal action (so it should come after the `and_yield`
      actions), but in other cases, the user may just use a block for a side
      effect, and may configure an terminal action as well. Only one block
      implementation is supported and it can be overridden.
  4. Refactor implementation pieces in prep for #230.

    myronmarston authored and JonRowe committed Mar 6, 2013
    This splits each implementation piece into a separate object
    so that it is easier to combine them.
Commits on Jun 13, 2013
  1. Add a changelog entry for #306.

    samphippen committed Jun 13, 2013
    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    
    Conflicts:
    	Changelog.md
  2. Spec double() stubs hash in different syntax modes.

    pda authored and samphippen committed Jun 12, 2013
    This tests a regression referenced in #306 where disabling the :should
    syntax raised errors when a stubs hash was passed to double().
  3. Bypass RSpec::Mocks::Syntax when mass-assigning stubs via double().

    pda authored and samphippen committed Jun 12, 2013
    When mock_with's `config.syntax = [:expect]`, the `#stub` method is not
    available on the TestDouble.
    
    This change bypasses the pluggable syntax layer, directly setting up
    allowance for a Matcher::Receive instance.
    
    Another option would be to use AcceptanceTarget.new(self).to(matcher)
    however the `#to` DSL-like method feels out of place when not used with
    the `allow(target)` receiver syntax, and also the AcceptanceTarget
    delegation implementation complexity is not required for internals like
    this.
Commits on May 30, 2013
  1. Merge pull request #297 from JonRowe/protect_against_edgecase_no_options

    JonRowe committed May 27, 2013
    Protect against edgecase no options
Commits on May 27, 2013
  1. Release 2.14.0.rc1

    myronmarston committed May 27, 2013
  2. Ignore rbx 1.9 failures for now.

    myronmarston committed May 27, 2013
    Rbx failures have often been intermittent, unfortunately.
  3. Merge pull request #287 from JonRowe/fix_for_186

    JonRowe committed May 27, 2013
    Fix to enable 186 support
Commits on May 26, 2013
  1. refactor for formatting

    JonRowe committed May 26, 2013
Commits on May 25, 2013
  1. simpler fix

    JonRowe committed May 24, 2013
  2. nasty hack for 186

    JonRowe committed May 13, 2013
Commits on May 23, 2013
  1. Merge pull request #290 from JonRowe/defer_to_rspec_core_when_available

    JonRowe committed May 23, 2013
    Match up deprecation message (extension of fixing deprecations)
  2. fix an internal spec

    JonRowe committed May 22, 2013
  3. Merge pull request #294 from rspec/new-deprecation-api

    JonRowe committed May 23, 2013
    update to the new deprecation API