Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rspec/rspec-core
base: v2.0.0
head fork: rspec/rspec-core
compare: v2.3.0
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Oct 11, 2010
@dchelimsky dchelimsky Pass --autotest over drb to get color to work w/ autotest+spork.
- Closes #184.
@dchelimsky dchelimsky history 10d9377
Commits on Oct 12, 2010
@dchelimsky dchelimsky upgrade cucumber 988b345
@dchelimsky dchelimsky Perf: get the right collection the first time
- turns out it is faster to inject over an array than to collection a
  bunch of arrays and flatten them
Commits on Oct 13, 2010
@txus txus Pending examples without docstring should not autogenerate descriptio…
…ns from previous examples

- Closes #186.
@dchelimsky dchelimsky back to cucumber 0.8.5 again (too many files bug) aa75bfe
@dchelimsky dchelimsky history 7e40fb8
Commits on Oct 14, 2010
@dchelimsky dchelimsky need to remove relish from Gemfile until it is released 03ee841
@dchelimsky dchelimsky Determine example and group location without restricting to a file

- Closes #190.
@dchelimsky dchelimsky Perf: simplify calculation of location
- caller is only used to determine file and line number as metadata is
  initialized. There is no need to store it.
- Also, the previous commit reduces the need for analysis of the caller
  stack. We therefore don't need to sling it around within the rspec
- Running the following 5000 times took 2.77 seconds before these last
  two commits, 1:58 after:

    describe "something" do
      it "does something" do
        1.should eq(1)

Please enter the commit message for your changes. Lines starting
Commits on Oct 15, 2010
@alexcrichton alexcrichton Added tests for making sure erb files/evaluations don't drop out of t…
…he textmate formatter
@alexcrichton alexcrichton Support stack traces with erb files in them and also show all lines f…
…rom stack trace even when it's not a ruby file. Just don't link files which aren't ruby files.

- Closes #155.
@dchelimsky dchelimsky Update generated html for textmate and html formatter specs. 4ce4e5f
Commits on Oct 16, 2010
@dchelimsky dchelimsky remove deprecation notices for items to be removed from 2.1 b66cc11
Commits on Oct 17, 2010
@dchelimsky dchelimsky bump version to 2.1.0.pre
- this supports building and installing from the latest source without
  over-writing released gems
Commits on Oct 18, 2010
@dchelimsky dchelimsky update dependency versions 88f3c21
@jfelchner jfelchner Add an 'bundler' option to the rake task. 34260d9
@dchelimsky dchelimsky words 1e71ba3
Commits on Oct 22, 2010
@dchelimsky dchelimsky update dependencies across development repos 62f1bde
Commits on Oct 23, 2010
@dchelimsky dchelimsky links to docs 4c5e75d
@glv glv Allow passing caller trace into Metadata to support extensions
- Closes #198.
Commits on Oct 24, 2010
@dchelimsky dchelimsky Properly deprecate Spec::Runner.configure
- also reinstate deprecation warning for Spec
- will remove both from rspec-3
@dchelimsky dchelimsky tweak words 54f8e2b
@dchelimsky dchelimsky Add deprecated Spec::Rake::SpecTask from rspec-1 with deprecation
warning and delegation to RSpec::Core::RakeTask
@dchelimsky dchelimsky don't forget to add the deprecated methods (ported from 2-0-stable br…
Commits on Oct 26, 2010
@dchelimsky dchelimsky words 302e77c
Commits on Oct 27, 2010
@dchelimsky dchelimsky add relish again 1531ec0
@dchelimsky dchelimsky words 73c15a1
@dchelimsky dchelimsky Add 'autospec' command to alert user that it has been removed. 56b0b11
Commits on Oct 29, 2010
@luislavena luislavena Use a link for upgrade instructions
Users report that after installing RSpec they cannot find any
documentation about upgrading from version 1.x to 2.x

- closes #204.
Commits on Oct 30, 2010
@dchelimsky dchelimsky specify version of relish 4a9378c
@dchelimsky dchelimsky tweak subject features f210eb1
@dchelimsky dchelimsky update some features 7cae0be
Commits on Nov 01, 2010
@dchelimsky dchelimsky don't use tap in feature (no tap in 1.8.6) 506441b
@myronmarston myronmarston Remove gemspec call from Gemfile.
- closes #200.
Commits on Nov 06, 2010
@lailsonbm lailsonbm Added support for filtering with tags on CLI.
Simple support for tags, as described in

- Closes #37.
@dchelimsky dchelimsky Fix bug where "subject { self }" caused a stack overflow.
- Closes #217.
@slyphon slyphon add a helpful message about RUBYOPT when require fails in bin/rspec
- Closes #211.
@dchelimsky dchelimsky exit with a non-zero status if rspec/autorun is not found 10bfa67
@dchelimsky dchelimsky get the rcov task (internal) working right again b91baa4
@dchelimsky dchelimsky require 'rspec/core' in the rake task
- Closes #215.
@tianyicui tianyicui Add -Ilib to default rcov_opts
- Closes #203.
@dchelimsky dchelimsky Explicitly register an example group from describe() 3b016d2
@justinko justinko Make rspec/expectations configurable.
rspec-core currently only supports using rspec-expectations to set
expectations and define matchers, but this opens the door for new
expectation frameworks and/or using assertion frameworks like that in
test/unit or minitest without having to load rspec's expectation

- Closes #118.
@myronmarston myronmarston Allow `pending` to be conditional.
This is handy for cases where an example gets run in multiple environments (say, multiple versions of ruby) and passes in one and fails in another.  This allows you to use the block pending form for only one of the environments.
Commits on Nov 07, 2010
@dchelimsky dchelimsky add deprecation warning for rake task warning=(true_or_false) aa0656d
@myronmarston myronmarston Add implicit :if and :unless filters.
* These are built in exclusion filters that can be overriden.
* When you configure a filter, it now merges with existing filters rather than completely overriding them.
* A spec/group is now filtered if ANY of the filter conditions apply; before it required ALL to apply.
* Filter lambdas can now accept a 2nd argument that is the metadata hash--this allows checking to see if the key is even in the hash (necessary for the :if filter).
@myronmarston myronmarston Fix example formatter output.
My changes (particularly the pending changes) have changed the backtraces a bit and forced me to re-generate these.  I'm having issues running the specs on JRuby so I wasn't able to re-gen those.
@myronmarston myronmarston Fix failing cuke.
There are now additional exclusion filters (:if and :unless).
@dchelimsky dchelimsky eliminate some warnings 7019ec4
@dchelimsky dchelimsky Merge remote branch 'myronmarston/if_and_unless_metadata' f8beca6
@dchelimsky dchelimsky restructure spec to get it to work on multiple ruby versions (was fai…
…ling on 1.9.2, but failure was not about spec'd behavior)
@dchelimsky dchelimsky change bundler rake task option to skip_bundler
- by default, include 'bundle exec' in the shell command generated by
  the rake task if a Gemfile is present
- this is overridable with task.skip_bundler = true
@dchelimsky dchelimsky History 59c7272
@dchelimsky dchelimsky more history 5ed55e4
@jeffkreeftmeijer jeffkreeftmeijer Add the --fail-fast command line option
- Closes #219.
@dchelimsky dchelimsky words 1a2f899
@dchelimsky dchelimsky configure guard-rspec adc3fe4
@dchelimsky dchelimsky Add gemfile option to rake task
- supports using alternate Gemfiles
@dchelimsky dchelimsky autoload RSpec::Matchers e4b44cf
@dchelimsky dchelimsky use regexp instead of start_with to support Ruby 1.8.6 6f08117
@myronmarston myronmarston Improve explanation of new conditionally pending feature. 3f9ed75
@myronmarston myronmarston Add description of implicit filtering to cuke.
- Closes #220.
@dchelimsky dchelimsky bump to 2.1.0 06d7b39
@dchelimsky dchelimsky update versions for development 36ed91a
Commits on Nov 10, 2010
@justinko justinko Raise an error if rspec-1 is loaded.
- this happens when both rspec-1 and rspec-2 are installed in the same
  environment, and a "require 'spec'" statement appears somewhere in the
  code (typically residual from an upgrade from rspec-1 to rspec-2).
- Closes #94.
@dchelimsky dchelimsky Implement pending spec and improve error message when rspec-1 is loaded. 6240273
Commits on Nov 11, 2010
@dchelimsky dchelimsky history 988edcf
@dchelimsky dchelimsky Make sure --fail-fast makes it across drb
- Closes #225.
@dchelimsky dchelimsky Check for Spec before checking for Spec::VERSION
- eliminates deprecation notices when running rspec's own specs
@dchelimsky dchelimsky Remove a few unnecessary instances of explicit blocks (e.g. &block) 99e27b2
Commits on Nov 12, 2010
@dchelimsky dchelimsky Lazy-eval file_path, line_number, and location 690c3ff
Commits on Nov 13, 2010
@dchelimsky dchelimsky inline arg default a907d44
@dchelimsky dchelimsky store instead of [key]= d17dbec
@dchelimsky dchelimsky Module inclusion should only require matching one filter 4e010e0
@dchelimsky dchelimsky Obeying the masters - no more bang-bang d2c9d0c
@dchelimsky dchelimsky Undo part of last commit that made it in accidentally
(working on more than one thing at the same time is a no-no)
Commits on Nov 14, 2010
@dchelimsky dchelimsky add a couple of guards to reduce unnecessary iterations cfb3b54
@dchelimsky dchelimsky just yield if possible (saves creating Proc object) cd91857
@dchelimsky dchelimsky object per example 1012613
Commits on Nov 17, 2010
@dchelimsky dchelimsky Pass -Ilib,spec to rcov.
- Closes #229.
@dchelimsky dchelimsky Fix errant documentation
- Closes #227.
@dchelimsky dchelimsky Pass -Ilib:spec to rcov.
- Closes #229 (again).
Commits on Nov 18, 2010
@dchelimsky dchelimsky tweak (c) 35c722e
@dchelimsky dchelimsky Merge branch 'master' of f293f9a
Commits on Nov 19, 2010
@dchelimsky dchelimsky history 7f10628
@dchelimsky dchelimsky constrain dep on rb-fsevent c6e834d
@dchelimsky dchelimsky use platforms in Gemfile as intended 0b278b2
@dchelimsky dchelimsky Make debugger statements _just work_
- debugger statements work anywhere in the code, even parts that are
  outside RSpec's control (like before a describe declaration).
- deprecated --debug/-d command line option
  - it doesn't do anything any more
- warns if ruby-debug is not installed
- only downside is for people who like to leave debugger statements
  around in their code
@dchelimsky dchelimsky Expose example.metadata in around hooks
- Closes #221.
@dchelimsky dchelimsky History 846679a
@dchelimsky dchelimsky History 5a5208d
@dchelimsky dchelimsky Merge branch 'master' of 913ce19
@dchelimsky dchelimsky a little overzealous, perhaps? 91d6d83
@dchelimsky dchelimsky method_missing is private b176cfb
Commits on Nov 22, 2010
@dchelimsky dchelimsky Fix bug in which classes passed to inner groups override the
"described_class" of the outer group.
Commits on Nov 25, 2010
@dchelimsky dchelimsky more method_missing privacy 46f0d49
@dchelimsky dchelimsky small refactoring 190f8c8
@dchelimsky dchelimsky rename internal key cc9f8c9
@dchelimsky dchelimsky using guard these days ... 921bb6a
@dchelimsky dchelimsky Change internally used --autotest option to --tty
- Closes #224.
@dchelimsky dchelimsky explain README links to documentation 3d0ac2b
@dchelimsky dchelimsky and again d7c4b9d
@dchelimsky dchelimsky upgrade cucumber 76e0d64
Commits on Nov 27, 2010
@bosko bosko Use ANSICON instead of win32console
- Closes #234.
@dchelimsky dchelimsky history 602d744
Commits on Nov 28, 2010
@spicycode spicycode Allow use of local repositories or gems for Bundler deps 732be07
@spicycode spicycode Disable verbose by default in our local Rakefile 68d1167
@spicycode spicycode Updating History c2aceab
@spicycode spicycode Adding jruby-openssl to the jruby platform bundle to eliminate warnings fcf781a
@dchelimsky dchelimsky prep for 2.2 release 456f2cf
@dchelimsky dchelimsky bump version to 2.2 d567ba3
@dchelimsky dchelimsky Merge branch 'master' of 2a3abed
@dchelimsky dchelimsky words b92b697
Commits on Nov 29, 2010
@jwilger jwilger Fix Kernel#method_missing override so that it gets along with REE 1.8…

- Closes #237.
@yoshuki yoshuki Changed --autotest to --tty.
- Closes #235.
@dchelimsky dchelimsky history 6420733
@dchelimsky dchelimsky Revert "Make debugger statements _just work_"
- restore the --debugger/-d option
- this created a situation in which debugger did not work at all with
  rails, so need to figure out a different solution

This reverts commit 2466831.
@dchelimsky dchelimsky date in history 61437f4
@dchelimsky dchelimsky one more time ec1ceed
@dchelimsky dchelimsky links\! ff8a16b
@dchelimsky dchelimsky wow, this is getting boring acf82f3
Commits on Nov 30, 2010
@dchelimsky dchelimsky links 8ad59ee
Commits on Dec 01, 2010
@dchelimsky dchelimsky bump to 2.3.0.pre 1d67c8c
Commits on Dec 02, 2010
@bhuga bhuga Add autotest/fsevent and autotest/growl to Gemfile
- Closes #239.
@dchelimsky dchelimsky initial stab at new SharedContext feature
- replaces rspec-1's share_as
Commits on Dec 03, 2010
@dchelimsky dchelimsky doc updates 303fd5a
Commits on Dec 05, 2010
@ldenman ldenman Add autotest-fsevent to bundle when ruby platform is darwin.
- Closes #243.
@dchelimsky dchelimsky History 74c93de
@dchelimsky dchelimsky add wip cuke for requiring arbitrary mock framework 8686ecc
@dchelimsky dchelimsky refactor mock framework configuration in prep for adding support for …
@dchelimsky dchelimsky config.mock_with accepts a mock framework adapter module
- Closes #242.
@dchelimsky dchelimsky small refactoring eef0b5c
@dchelimsky dchelimsky refactor expectation framework configuration in prep for adding support
for expecting with the assertion framework provided by stdlib
@dchelimsky dchelimsky Support using rspec/expecations, test/unit/assertions, or both.
- also removed obsolete experimental cuke feature
@dchelimsky dchelimsky words 349b7ec
Commits on Dec 06, 2010
@lackac lackac Fix issue when RSpec invokes the subject block multiple times
- Closes #244.
@dchelimsky dchelimsky add rspec examples for previous commit 27e1b2c
@dchelimsky dchelimsky History 6530634
@dchelimsky dchelimsky Merge branch 'master' of 4fbd717
Commits on Dec 11, 2010
@dchelimsky dchelimsky lock ZenTest at ~> 4.4.2 c228993
@dchelimsky dchelimsky Add "rspec2" to list of Autotest discoveries if ./.rspec file is found. dc1b0d5
Commits on Dec 12, 2010
@dchelimsky dchelimsky Fix bug in which around hooks caused stack overflow in ruby-1.8.7. d8a3085
@dchelimsky dchelimsky align Gemfiles across rspec dev repos 6df9d2f
@dchelimsky dchelimsky prep for 2.3.0 release d0d9e89