Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: custom_orderin…
Commits on Jun 15, 2012
  1. @myronmarston
  2. @myronmarston
  3. @myronmarston
  4. @myronmarston
Commits on Jun 11, 2012
  1. @alindeman
  2. @myronmarston

    Merge pull request #629 from rspec/delay-drb-loading

    myronmarston authored
    Delay the loading of DRB.
Commits on Jun 9, 2012
  1. @alindeman

    Changelog for #594 [ci skip]

    alindeman authored
  2. @alindeman

    `--require` is merged among different configuration sources

    alindeman authored
    * e.g., `--require` specified in SPEC_OPTS will be merged with
      `--require` specified in `.rspec`
    * Fixes #594
  3. @dchelimsky

    Bump version to 2.10.1

    dchelimsky authored
    This was done already before the 2.10.1 release, but only on the 2-10
    maintenance branch.
Commits on Jun 6, 2012
  1. @justinko

    Merge pull request #630 from hynkle/typo

    justinko authored
    fix typo
  2. @hynkle

    fix typo

    hynkle authored
  3. @myronmarston

    Delay the loading of DRB.

    myronmarston authored
    - 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. @dchelimsky
  2. @dchelimsky
  3. @dchelimsky

    use `define_method` instead of `let` for named subject

    dchelimsky authored
    `subject` already memoizes the value
Commits on May 31, 2012
  1. @dchelimsky
Commits on May 27, 2012
  1. @dchelimsky

    README tweaks

    dchelimsky authored
  2. @dchelimsky
  3. @dchelimsky
  4. @dchelimsky
  5. @dchelimsky
  6. @justinko

    Revert "Merge pull request #443 from nicknovitski/patch-2"

    justinko authored
    This reverts commit ea668aa, reversing
    changes made to 8010fc3.
  7. @justinko

    Merge pull request #443 from nicknovitski/patch-2

    justinko authored
    use RR's rspec2 adapter (re: issue #136)
Commits on May 25, 2012
  1. @dchelimsky

    Merge pull request #623 from brynary/codeclimate-badge

    dchelimsky authored
    Add Code Climate badge
  2. @brynary

    Add Code Climate badge

    brynary authored
Commits on May 23, 2012
  1. @myronmarston

    Improve on 27059bf.

    myronmarston authored
    * 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. @myronmarston

    Update changelog.

    myronmarston authored
  2. @myronmarston

    Don't silence 2nd exceptions.

    myronmarston authored
    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. @dchelimsky

    Re-reformat failure message.

    dchelimsky authored
    Fixes cuke broken by 43ec3a8 caused
    by reformatting a file, which accidentally re-indented a HERE doc.
  2. @justinko

    changelog

    justinko authored
  3. @justinko

    Remove redundant logic.

    justinko authored
  4. @justinko

    Only run windows specific specs if on the windows OS.

    justinko authored
    travis-ci will be supporting multiple OS's in the future.
  5. @justinko
  6. @justinko
Commits on May 19, 2012
  1. @dchelimsky
Something went wrong with that request. Please try again.