Permalink
Commits on Jun 19, 2013
  1. @JonRowe

    refactored fix for lambdas

    JonRowe committed Jun 19, 2013
  2. @JonRowe

    cleanup

    JonRowe committed Jun 19, 2013
  3. @JonRowe

    updated specs for passing lambda

    JonRowe committed Jun 19, 2013
  4. @JonRowe
Commits on Jun 18, 2013
  1. @myronmarston

    Clarify relationship between different method stub actions.

    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.
    myronmarston committed Mar 12, 2013
  2. @myronmarston

    Refactor implementation pieces in prep for #230.

    This splits each implementation piece into a separate object
    so that it is easier to combine them.
    myronmarston committed Mar 6, 2013
Commits on Jun 15, 2013
  1. @soulcutter

    Merge pull request #310 from granth/readme-syntax

    remove orphaned references to stub and should_receive from README
    soulcutter committed Jun 15, 2013
  2. @granth
Commits on Jun 14, 2013
  1. @JonRowe

    Merge pull request #305 from thomas-holmes/update-docs-to-expectation…

    …-syntax
    
    Update README.md to use expect syntax.
    JonRowe committed Jun 14, 2013
  2. @JonRowe

    Merge pull request #304 from rspec/coveralls_tweaks

    Coveralls tweaks.
    JonRowe committed Jun 14, 2013
  3. @JonRowe
  4. @JonRowe
  5. @JonRowe

    Merge pull request #308 from rspec/remove_186_support

    Remove 186 support
    JonRowe committed Jun 14, 2013
Commits on Jun 13, 2013
  1. @JonRowe

    document dropping 1.8.6

    JonRowe committed Jun 13, 2013
  2. @samphippen

    Add a changelog entry for #306.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed Jun 13, 2013
  3. @samphippen

    Merge pull request #306 from pda/expect_syntax_assign_stubs

    Bypass RSpec::Mocks::Syntax when mass-assigning stubs via double().
    samphippen committed Jun 13, 2013
  4. @JonRowe

    remove spec workarounds

    JonRowe committed Jun 13, 2013
  5. @JonRowe
  6. @JonRowe

    remove instance exec

    JonRowe committed Jun 13, 2013
Commits on Jun 12, 2013
  1. @pda

    Spec double() stubs hash in different syntax modes.

    This tests a regression referenced in #306 where disabling the :should
    syntax raised errors when a stubs hash was passed to double().
    pda committed Jun 12, 2013
  2. @pda

    Bypass RSpec::Mocks::Syntax when mass-assigning stubs via double().

    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.
    pda committed Jun 12, 2013
Commits on Jun 11, 2013
  1. @thomas-holmes

    Put hashrockets back in place

    Keep using hashrockets in examples for rspec-mocks as they are syntax compatible with all supported versions of Ruby.
    thomas-holmes committed Jun 11, 2013
Commits on Jun 9, 2013
  1. @myronmarston

    Coveralls tweaks.

    - No need for `wear_merged!`
    - Let's not `rescue Exception` unless we really need it.
    myronmarston committed Jun 9, 2013
Commits on Jun 8, 2013
  1. @JonRowe

    make myrons improvements

    JonRowe committed Jun 8, 2013
Commits on Jun 7, 2013
  1. @JonRowe

    Merge pull request #302 from JonRowe/setup_coveralls

    Setting up coveralls...
    JonRowe committed Jun 7, 2013
  2. @JonRowe
Commits on Jun 6, 2013
  1. @JonRowe
  2. @thomas-holmes
  3. @JonRowe

    tweak setup

    JonRowe committed Jun 6, 2013
  4. @JonRowe

    update readme

    JonRowe committed Jun 5, 2013
  5. @JonRowe

    coveralls setup

    JonRowe committed Jun 5, 2013
Commits on Jun 5, 2013
  1. @dchelimsky
Commits on May 30, 2013
  1. @samphippen

    Fix an array_including docstring.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 30, 2013
  2. @samphippen

    Merge pull request #301 from samphippen/array-including-matcher

    Add an array_including argument matcher
    samphippen committed May 30, 2013
  3. @samphippen

    Add an array_including argument matcher

    Closes #295.
    
    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 30, 2013