Permalink
Switch branches/tags
Commits on Jun 15, 2012
Commits on Jun 11, 2012
  1. Merge pull request #629 from rspec/delay-drb-loading

    myronmarston committed Jun 11, 2012
    Delay the loading of DRB.
Commits on Jun 9, 2012
  1. Changelog for #594 [ci skip]

    alindeman committed Jun 9, 2012
  2. `--require` is merged among different configuration sources

    alindeman committed Jun 9, 2012
    * e.g., `--require` specified in SPEC_OPTS will be merged with
      `--require` specified in `.rspec`
    * Fixes #594
  3. Bump version to 2.10.1

    dchelimsky committed Jun 9, 2012
    This was done already before the 2.10.1 release, but only on the 2-10
    maintenance branch.
Commits on Jun 6, 2012
  1. Merge pull request #630 from hynkle/typo

    justinko committed Jun 6, 2012
    fix typo
  2. fix typo

    hynkle committed Jun 6, 2012
  3. Delay the loading of DRB.

    myronmarston committed Jun 6, 2012
    - Most of the time users don't use DRB. This'll speed up the start time a bit
      by not unnecessarily loading it when it's not used.
    - Apparently jruby 1.7.0-preview1 loads the delegate library when DRB is loaded [1][2].
      This causes expectations on delegate objects to fail because `should` never gets added
      to them. By delaying when delegate gets loaded, it allows a user to load
      `rspec/expectations` and then `delegate` and ensure it works.
    
    [1] rspec/rspec-expectations#148 (comment)
    [2] The backtrace at the point delegate is loaded:
    /Users/myron/.rvm/rubies/jruby-head/lib/ruby/1.9/drb/drb.rb:1:in `require'
    /Users/myron/.rvm/rubies/jruby-head/lib/ruby/1.9/drb/drb.rb:1:in `(root)'
    /Users/myron/.rvm/rubies/jruby-head/lib/ruby/1.9/drb/drb.rb:57:in `require'
    /Users/myron/.rvm/rubies/jruby-head/lib/ruby/1.9/drb/drb.rb:57:in `(root)'
    /Users/myron/.rvm/gems/jruby-head/gems/rspec-core-2.10.1/lib/rspec/core/runner.rb:1:in `require'
    /Users/myron/.rvm/gems/jruby-head/gems/rspec-core-2.10.1/lib/rspec/core/runner.rb:1:in `(root)'
    /Users/myron/.rvm/gems/jruby-head/gems/rspec-core-2.10.1/lib/rspec/core/runner.rb:1:in `(root)'
    file:/Users/myron/.rvm/rubies/jruby-head/lib/jruby.jar!/jruby/kernel19/kernel.rb:1:in `(root)'
    file:/Users/myron/.rvm/rubies/jruby-head/lib/jruby.jar!/jruby/kernel19/kernel.rb:19:in `require'
    file:/Users/myron/.rvm/rubies/jruby-head/lib/jruby.jar!/jruby/kernel19/kernel.rb:19:in `require_relative'
    /Users/myron/.rvm/gems/jruby-head/gems/rspec-core-2.10.1/lib/rspec/core.rb:4:in `require'
    /Users/myron/.rvm/gems/jruby-head/gems/rspec-core-2.10.1/lib/rspec/core.rb:4:in `require_rspec'
    /Users/myron/.rvm/gems/jruby-head/bin/rspec:23:in `load'
    /Users/myron/.rvm/gems/jruby-head/bin/rspec:23:in `(root)'
Commits on Jun 4, 2012
  1. use `define_method` instead of `let` for named subject

    dchelimsky committed Jun 4, 2012
    `subject` already memoizes the value
Commits on May 31, 2012
Commits on May 27, 2012
  1. README tweaks

    dchelimsky committed May 27, 2012
  2. Revert "Merge pull request #443 from nicknovitski/patch-2"

    justinko committed May 27, 2012
    This reverts commit ea668aa, reversing
    changes made to 8010fc3.
  3. Merge pull request #443 from nicknovitski/patch-2

    justinko committed May 27, 2012
    use RR's rspec2 adapter (re: issue #136)
Commits on May 25, 2012
  1. Merge pull request #623 from brynary/codeclimate-badge

    dchelimsky committed May 25, 2012
    Add Code Climate badge
  2. Add Code Climate badge

    brynary committed May 25, 2012
Commits on May 23, 2012
  1. Improve on 27059bf.

    myronmarston committed May 23, 2012
    * Fix specs. The `should_receive(:message).with(/.../)` wasn't working as
      expected...it passed even if the message text didn't match the regex.
      I figured out that it was because of the fact that the error was being
      raised within the example-under-test, which already had two errors and
      was simply printing (or, previously, silencing) the extra error.  The
      solution is to capture the reported message using a stub implementation,
      and then assert on it after running the example.
    * The added context ("in an after hook") for 2nd errors happening in an
      after hook wasn't being included in the printed message. This is fixed now.
Commits on May 22, 2012
  1. Update changelog.

    myronmarston committed May 22, 2012
  2. Don't silence 2nd exceptions.

    myronmarston committed May 22, 2012
    When an example raises an error and an after or around hook also raises an error, the 2nd error was being silenced, since `set_exception` was a no-op when the exception was already set.  Silencing errors is bad, so we should print the error instead.
    
    See https://github.com/myronmarston/vcr/issues/167#issuecomment-5814249 for the issue that triggered this change.
Commits on May 20, 2012
  1. Re-reformat failure message.

    dchelimsky committed May 20, 2012
    Fixes cuke broken by 43ec3a8 caused
    by reformatting a file, which accidentally re-indented a HERE doc.
  2. changelog

    justinko committed May 20, 2012
  3. Remove redundant logic.

    justinko committed May 20, 2012
  4. Only run windows specific specs if on the windows OS.

    justinko committed May 20, 2012
    travis-ci will be supporting multiple OS's in the future.
  5. Merge pull request #605 from jarmo/bug_396

    justinko committed May 20, 2012
    fixes #396
Commits on May 19, 2012