Permalink
Switch branches/tags
Commits on May 8, 2013
  1. Merge branch 'master' into new_syntax

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    
    Conflicts:
    	lib/rspec/mocks/have_received.rb
    	lib/rspec/mocks/method_double.rb
    samphippen committed May 8, 2013
Commits on May 7, 2013
  1. Move the spec_helper create in expect_syntax.feature to a background.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 7, 2013
  2. Clean up expect_syntax.feature.

    Review from @JonRowe.
    
    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 7, 2013
  3. Add a .feature for the new expect syntax.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 7, 2013
  4. Change :direct and :wrapped for :should and :expect.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 7, 2013
Commits on May 6, 2013
  1. Merge pull request #282 from samphippen/fix-2.0.0-warnings

    Fix some warnings seen under ruby 2.0.0
    samphippen committed May 6, 2013
  2. Merge pull request #283 from samphippen/remove-to-not-mock-spec

    Remove a to_not raise_error(NameError) in mock_spec.
    myronmarston committed May 6, 2013
  3. Remove a to_not raise_error(NameError) in mock_spec.

    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 6, 2013
  4. Fix some warnings seen under ruby 2.0.0

    Closes #281
    
    Signed-off-by: Sam Phippen <samphippen@googlemail.com>
    samphippen committed May 6, 2013
Commits on May 1, 2013
  1. Show warnings

    JonRowe committed May 1, 2013
Commits on Apr 25, 2013
  1. Merge pull request #277 from JonRowe/fix_isolation_of_allow_message_e…

    …xpectations_on_nil
    
    Fix isolation of allow_message_expectations_on_nil
    myronmarston committed Apr 25, 2013
  2. update changelog

    JonRowe committed Apr 25, 2013
  3. grammar

    JonRowe committed Apr 24, 2013
Commits on Apr 24, 2013
  1. Merge pull request #276 from JonRowe/fix_marshal_dump_for_nil

    Fix Marshall.dump when used with expectations on nil
    JonRowe committed Apr 24, 2013
Commits on Apr 23, 2013
  1. forcibly reset warnings

    JonRowe committed Apr 23, 2013
  2. switch how we check nil equality

    JonRowe committed Apr 23, 2013
  3. changelog entry

    JonRowe committed Apr 23, 2013
Commits on Apr 19, 2013
  1. Merge pull request #256 from thoughtbot/jf-have-received-description

    Generate a useful description for have_received
    myronmarston committed Apr 19, 2013
  2. Generate a useful description for have_received

    * Makes `it { should have_received(:message) }` produce useful output
    jferris committed Mar 29, 2013
Commits on Apr 18, 2013
  1. Merge pull request #269 from samphippen/better-received-messages-args

    Give a better error message on received expectations with args
    myronmarston committed Apr 18, 2013
  2. Improve the way we make `expect` available when rspec-expectations is…

    … not used.
    
    - Put it in a named rather than anonymous module.
    - Allow the syntax to be toggled.
    myronmarston committed Apr 18, 2013
Commits on Apr 15, 2013
  1. Merge pull request #273 from samphippen/mutate-on-classes-defining-send

    Make `stub_const` work on classes that define `self.send`
    myronmarston committed Apr 15, 2013