Permalink
Switch branches/tags
Commits on Jul 7, 2012
  1. bump to 2.11.0

    dchelimsky committed Jul 7, 2012
  2. update Changelog

    dchelimsky committed Jul 7, 2012
  3. refactor: rename method

    dchelimsky committed Jul 7, 2012
Commits on Jul 4, 2012
Commits on Jun 29, 2012
Commits on Jun 21, 2012
  1. Revert "Merge pull request #609 from alexch/json-formatter"

    dchelimsky committed Jun 21, 2012
    This reverts commit 8e41f1a, reversing
    changes made to 076d683.
  2. Revert "Revert "formatters run better when $SAFE mode is on""

    dchelimsky committed Jun 21, 2012
    This reverts commit 713ad6f.
  3. Revert "formatters run better when $SAFE mode is on"

    dchelimsky committed Jun 21, 2012
    This is causing failures in Ruby 1.8.7, jruby, and ree
    
    This reverts commit 576b82d.
  4. Restore "Merge pull request #609 from alexch/json-formatter""

    dchelimsky committed Jun 21, 2012
    Most of the commits with this merge are fine - only one is causing failures
    in some rubies - we can deal with that issue separately.
    
    This reverts commit 359cd38.
  5. Revert "Merge pull request #609 from alexch/json-formatter"

    dchelimsky committed Jun 21, 2012
    Failed in ci build for 1.8.7, jruby, ree
    
    This reverts commit 8e41f1a, reversing
    changes made to 076d683.
  6. Changelog for #609 [ci skip]

    dchelimsky committed Jun 21, 2012
  7. Merge pull request #609 from alexch/json-formatter

    dchelimsky committed Jun 21, 2012
    JSON formatter
  8. refactoring: alias prepend and append on HookCollection

    dchelimsky committed Jun 20, 2012
    - a bit more OO
    - one less conditional per hook registration
Commits on Jun 16, 2012
  1. Don't add `describe` to every object.

    myronmarston committed Jun 16, 2012
    Instead, make it only available on:
      - The main object--so it can be used at the top level.
      - Modules--so example groups can be declared nested
        within modules, as is the common practice.
    
    Besides this, the only other place we need describe is from within
    example groups (so we can nest them), and this is taken care of by
    RSpec::Core::ExampleGroup.describe.
    
    I got the idea for this from a recent change in Sinatra that similarly
    limits the DSL to just the main object rather than all objects:
    
    sinatra/sinatra@46bdb7d
Commits on Jun 15, 2012
  1. remove dead code

    dchelimsky committed Jun 11, 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. fix typo in README [ci skip]

    dchelimsky committed May 27, 2012
  3. Add travis-ci badge to README

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

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

    justinko committed May 27, 2012
    use RR's rspec2 adapter (re: issue #136)