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.1.0
head fork: rspec/rspec-core
compare: v2.5.2
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Nov 07, 2010
@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
Commits on Dec 13, 2010
@dchelimsky dchelimsky first cut at relish nav f51a3fa
@dchelimsky dchelimsky better feature names a3b7f88
@dchelimsky dchelimsky / 7a6cd93
@dchelimsky dchelimsky Add copies of Upgrade and History to features so they appear in relish.
Need to remove the root directory copies, but that will require changing
some links to their github locations.
@dchelimsky dchelimsky change filename so it looks nicer in relish 6926e03
Commits on Dec 14, 2010
@dchelimsky dchelimsky relish nav fcd4726
@dchelimsky dchelimsky bump version to 2.4.0.pre 408c044
@cjheath cjheath start the debugger on -d so the stack trace is visible when it stops …
…at a debugger call

- Closes #250.
@dchelimsky dchelimsky Split example from previous commit in two and reset Debugger
- there are two separate requirements, so each one gets its own example
- need to able to use the debugger when running rspec on itself
@dchelimsky dchelimsky History 3b80a31
@dchelimsky dchelimsky Send debugger warning message to $stdout if
RSpec.configuration.error_stream has not been defined yet.
Commits on Dec 15, 2010
@jarmo jarmo HtmlFormatter takes into account nested example groups for better vie…
…wing experience

- Closes #252.
@jarmo jarmo remove "warning: parenthesize argument(s) for future version"
- Closes #253.
@dchelimsky dchelimsky History 691dc90
Commits on Dec 18, 2010
@dchelimsky dchelimsky dev-support: update relish task 5332298
Commits on Dec 20, 2010
@dchelimsky dchelimsky the default default _is_ false 059c1e8
Commits on Dec 23, 2010
@dchelimsky dchelimsky docs: beef up before/after hook narrative 37a31cf
@sorah sorah Create a new collection and reject the hooks we don't want
- necessary due to changes in Ruby 1.9.3 (in dev)
- see
@dchelimsky dchelimsky Create a new hook collection w/ selected hooks. a139a28
@dchelimsky dchelimsky History 809ff6a
@dchelimsky dchelimsky better wording fe3fb5c
John Firebaugh Be explicit about passing block to super
Allows specs with around hooks to work on JRuby again by
working around
Also, explicit is better than implicit.

- Closes #256.
@dchelimsky dchelimsky history c1b58ca
Commits on Dec 28, 2010
@dchelimsky dchelimsky Fix hook filtering so global hooks can apply to individual examples.
- Closes #261.
@dchelimsky dchelimsky words 1e4f88c
@dchelimsky dchelimsky history fda0549
@janmejay janmejay rake_task now capable of loading specs with single and double quotes …
…in path

- Closes #247.
@dchelimsky dchelimsky Specify the escapes rather than shelling out. 6d7c861
Commits on Dec 29, 2010
@dchelimsky dchelimsky focus rather than focused d3456f3
@dchelimsky dchelimsky Restore --options CLI option from rspec-1
- sets path to custom options file
- ignores ~/.rspec and ./.rspec
- Closes #228.
Commits on Dec 30, 2010
@dchelimsky dchelimsky history a7ff363
Commits on Dec 31, 2010
@Burgestrand Burgestrand require 'ostruct' to fix bug with its([key])
- Closes #264
@dchelimsky dchelimsky history d794001
@dchelimsky dchelimsky merge two feature files db803b3
@dchelimsky dchelimsky --configure option generates .rspec file instead of autotest/discover.rb 801e7bc
@dchelimsky dchelimsky support multiple formatters
- Closes #213.
@dchelimsky dchelimsky whitespace and typos 07c97d1
@dchelimsky dchelimsky update history w/ 2.3.1 info a0edfa6
Commits on Jan 01, 2011
@dchelimsky dchelimsky remove obsolete method e6c5a21
@dchelimsky dchelimsky consistency 3e7ce82
@dchelimsky dchelimsky Show exception classes in failures unless they come from rspec matchers
or message expectations.

- Closes #92.
@dchelimsky dchelimsky history 06d52e7
@dchelimsky dchelimsky Support before(:all) { pending } 83262db
@dchelimsky dchelimsky Better support for add_formatter in configuration.
- create the formatter's output file in config instead of opt parser.
Commits on Jan 02, 2011
@dchelimsky dchelimsky prep for 2.4.0 release da33be3
Commits on Jan 03, 2011
@dchelimsky dchelimsky remove completely unnecessary line 5dc63b1
Commits on Jan 04, 2011
Brian Faherty corrected the count in the html formater
- Closes #265.
@dchelimsky dchelimsky history 877cc86
@dchelimsky dchelimsky docs 27deb82
Commits on Jan 07, 2011
@dchelimsky dchelimsky Don't clobber formatter options when generating drb_argv
- fixes bug in which --drb + formatters would raise an error when not
  running in drb
- Closes #267
Commits on Jan 08, 2011
@jeffkreeftmeijer jeffkreeftmeijer Use current_indentation instead of ' ' * @group_level in the document…
…ation formatter

- Closes #271.
Commits on Jan 13, 2011
@myronmarston myronmarston Add scripts that run specs/cukes against all supported rubies.
- script/spec runs specs
- script/cucumber runs cukes
- script/full_build runs both

Also update Gemfile so it can be used cleanly on lots of rubies.

It now works on:

- MRI 1.8.6
- MRI 1.8.7
- MRI 1.9.1
- MRI 1.9.2
- JRuby 1.5.6
- Rubinius 1.1.1
- REE 1.8.7

- Closes #260
@dchelimsky dchelimsky Add #focus as an alias for #focused.
- see d3456f3#comments
  for more info,
- Closes #268.
@myronmarston myronmarston Allow filtered :all hooks to be applied to nested example groups.
Previously, they could only be applied to top-level example groups.

- Closes #274.
Commits on Jan 15, 2011
@myronmarston myronmarston Add cukes documenting helper methods and let.
- Closes #275.
@dchelimsky dchelimsky cuke tweaks 37e7bdd
@dchelimsky dchelimsky more cuke tweaks 1f109e5
Commits on Jan 16, 2011
@dchelimsky dchelimsky loosen constraint on outcome in example that returns an array
- Closes #278.
@dchelimsky dchelimsky cukes/docs dfd0314
@dchelimsky dchelimsky Add -- --skip-bundler option for autotest
- Closes #191.
@dchelimsky dchelimsky sort rather than match on unsorted content be775bb
Commits on Jan 17, 2011
@dchelimsky dchelimsky eliminate dup docs 26271e1
@dchelimsky dchelimsky docs c4a852d
@monocle monocle Allow tag filtering when using drb
- Closes #277.
@dquimper dquimper Added checkboxs at the top of the page to filter examples.
- Closes #270.
@dchelimsky dchelimsky move the checkboxes into the header 3b608f3
@dchelimsky dchelimsky update html and textmate formatter 'golden masters' 26f3098
@dchelimsky dchelimsky update changelog 258bd20
@iromeo iromeo Prefer SPEC_OPTS to cli
- Closes #276.
@dchelimsky dchelimsky update changlog 881efbd
Commits on Jan 20, 2011
@dchelimsky dchelimsky update upgrade link
- Closes #284.
Commits on Jan 21, 2011
@dchelimsky dchelimsky Deprecate automatic assumption of bundler with autotest.
- use Autotest's bundler plugin instead.
- use 'autotest -- --skip-bundler' to skip 'bundle exec'.
Commits on Jan 22, 2011
@dchelimsky dchelimsky Refactor autotest / rspec / bundler codes
- --skip-bundler beats 'autotest/bundler'
@dchelimsky dchelimsky update changelog c1a9383
@dchelimsky dchelimsky minor tweaks to rspec command help output 714176c
Commits on Jan 23, 2011
@JonRowe JonRowe ignore rvmrc ada3a5d
Commits on Jan 25, 2011
@dchelimsky dchelimsky Use File::PATH_SEPARATOR
- thanks to Luis Lavena for the pointer
- Closes #289.
@JonRowe JonRowe Fix bug matching failures for autotest with colorized output.
- Closes #251.
- Closes #288.
Commits on Jan 26, 2011
John Firebaugh Be more explicit about passing a block
JRuby 1.6.0 is not likely to support the previous bit of
magic; see

- Closes #291.
@dchelimsky dchelimsky changelog 837ccdd
Commits on Jan 27, 2011
@briandunn briandunn added example of #its(:attribute) calling the attribute twice 56b6a65
@dchelimsky dchelimsky memoize subject with its\n\n- Closes #292 599c0c9
@dchelimsky dchelimsky move 'its' specs to subject_spec and reorg a bit 14d77bf
@dchelimsky dchelimsky changes 6a860d9
@dchelimsky dchelimsky Make Procsy a module and extend the generated Procs instead of
inheriting from Proc.

- This allows Procsy to behave correctly in all supported versions of
  MRI, as well as JRuby-1.5 and JRuby-1.6.
- See
- See
- Thanks to John Firebaugh for the suggestion!
- Closes #291 (hopefully forealz)
@dchelimsky dchelimsky dev: use regexps in Guardfile 4521850
@dchelimsky dchelimsky docs 1a66ce9
Commits on Feb 01, 2011
@dnurzynski dnurzynski Fix rspec hangs after String.alias :to_int :to_i
- Closes #195.
- Closes #295.
@dchelimsky dchelimsky update Changelog 0f9deff
Commits on Feb 05, 2011
@joliss joliss minor doc fixes
- Closes #298.
@grosser grosser allow specs to run without needing to checkout all rspec projects
- Closes #149.
@dchelimsky dchelimsky Rollback to earlier approach to including other libs. 957b368
@dchelimsky dchelimsky prep for 2.5 release 70acb98
Commits on Feb 06, 2011
@dchelimsky dchelimsky Remove --skip-bundler and post -- arg handling from rspec_autotest
Unfortunately, this breaks compatibility, but it is a much simpler and
more sane approach to including or excluding 'bundle exec' in the
autotest command.

- default: do not include it
- to include it, use the autotest bundler plugin
@dchelimsky dchelimsky prep 2.5.1 release af1454d
Commits on May 05, 2011
@dchelimsky dchelimsky remove deprecated default_executable from gemspecx 8d058cd