Skip to content


Subversion checkout URL

You can clone with
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.6.4
head fork: rspec/rspec-core
compare: v2.7.1
Commits on Jun 03, 2011
@travis travis Make sure nested at_exit blocks don't break exit status
Per jnicklas/capybara#178, it's possible
to have at_exit handlers installed inside Runner's run method that
execute after the 'exit' call in autorun. These at_exit handlers
can actually change the exit status (in this case, manual testing
reveals that capybara's call to @browser.quit in driver.rb seems to
be the problem).

Avoid this issue entirely by isolating the at_exit handler that calls
exit, ensuring it can't nest at_exit handlers.
Commits on Jun 06, 2011
@dchelimsky dchelimsky oops a74533d
@ifesdjeen ifesdjeen Removing Rubinius from .travis.yml due to hanging rbx process hanging…
… after running rake task. Rubinius issue opened:
@dchelimsky dchelimsky Merge pull request #402 from ifesdjeen/master
Rspec-core with Rubinius leave hanging rbx process on
Commits on Jun 08, 2011
@dchelimsky dchelimsky relish docs e2eb136
@dchelimsky dchelimsky add example.exception
- Closes #401.
Commits on Jun 09, 2011
@justinko justinko Set a default_directory so you can type "rspec", not "rspec spec"
- See #397.
@dchelimsky dchelimsky stub out config.files_to_run in examples that run specs but don't nee…
…d to

- See #397
@dchelimsky dchelimsky dev: add --default_directory to rspec's config
- See #397
@dchelimsky dchelimsky change default_directory to default_path
- Closes #397
@justinko justinko Change feature filename 7415063
@justinko justinko relish .nav bea2366
Commits on Jun 10, 2011
@dchelimsky dchelimsky ci: build against jruby is hanging on travis, so removing for now 2c9aef1
@dchelimsky dchelimsky --default_directory is not supported on Ruby 1.8.6 9f7b495
Commits on Jun 11, 2011
@dchelimsky dchelimsky Support default_path option across all supported rubies
The issue was the non-deterministic order of hash keys.
@dchelimsky dchelimsky less flattening 781490c
@dchelimsky dchelimsky ignore .rbc files 0f4127b
@dchelimsky dchelimsky dev: Rakefile tweaks 8519153
@dchelimsky dchelimsky dev/ci: add binstubs to 'b' directory and tell travis to run b/rake
Tried to move this gem's bin dir to exe and store binstubs in bin, but
that resulted in a stack overflow error.
@dchelimsky dchelimsky dev: add rdoc to Gemfile 436e818
@dchelimsky dchelimsky dev: remove dep on rdoc 10fb571
@dchelimsky dchelimsky one more binstub d0b62b4
Commits on Jun 13, 2011
@dchelimsky dchelimsky dev: constrain file list in gemspec 5068e70
Commits on Jun 14, 2011
@adzap adzap Ensure let methods return a cached nil value instead of repeatedly ev…
…aling block
@dchelimsky dchelimsky Minor adjustments to let_spec.rb 4c6356c
@dchelimsky dchelimsky Changelog f1ea985
Commits on Jun 17, 2011
@dchelimsky dchelimsky fix failing formatter specs f14f3c2
@dchelimsky dchelimsky fix failing formatter specs in 1.8.7 aa6d8f5
@dchelimsky dchelimsky ci: pull 1.9.1 from travis build - upstream deps are causing errors 9f1018d
@dchelimsky dchelimsky fix failing formatter specs in 1.8.6 092a57f
@hjdivad hjdivad Specify multiple examples by line number
- Pull request #348
@dchelimsky dchelimsky changelog 5ed585d
Commits on Jun 18, 2011
@dchelimsky dchelimsky names c240059
Commits on Jun 19, 2011
@dchelimsky dchelimsky remove unnecessary constraint on args passed to before/after/around h…
@dchelimsky dchelimsky Revert "remove unnecessary constraint on args passed to before/after/…
…around hooks"

This reverts commit 90665b8.
@dchelimsky dchelimsky adjust for regex bug in Ruby 1.8.6
- something is eating $1 - unclear who, how, or why
@dchelimsky dchelimsky more names d1f7d7a
Commits on Jun 20, 2011
@gunn gunn Allow classes and modules to be used as shared example group identifi…
…ers. Helps with issue rspec/rspec-core#398.
@hjdivad hjdivad Fix build in 1.8.7.
Signed-off-by: Justin Ko <>
@justinko justinko Merge pull request #408 from gunn/master
Allow classes and modules to be used as shared example group identifiers. Closes #398
@justinko justinko Iteration instead of multiple "or" d644433
@justinko justinko Move example classes into the describe block. dcd5dc4
@justinko justinko changelog bbd2e19
Commits on Jun 21, 2011
@dchelimsky dchelimsky fix formatter comparison files for jruby e177f16
@dchelimsky dchelimsky fix potentially misleading message when ruby-debug fails to load
- it was saying install 'ruby-debug' even if the problem was an upstream
- now it uses the message from the LoadError to define the missing gem
@dchelimsky dchelimsky ci: exclude local dev gems from travis bundle 66e835d
@dchelimsky dchelimsky dev: bump aruba timeout to 5 seconds cc7273e
@dchelimsky dchelimsky dev: update cucumber, aruba, and move some gems around Gemfile a43cf09
@dchelimsky dchelimsky move executables to executables dir so we can use bin for dev bin files 8c60081
@dchelimsky dchelimsky dev: rename feature file 4012ef2
@dchelimsky dchelimsky add warnings and conventions to shared examples doc
- addresses doc issue in #407, but can not close the issue until this is
  deployed to
Commits on Jun 23, 2011
@dchelimsky dchelimsky dev: remove bin/ from git 8ef31d7
Commits on Jun 24, 2011
@dchelimsky dchelimsky Merge pull request #400 from utahstreetlabs/master
Make sure nested at_exit blocks don't break exit status
@dchelimsky dchelimsky changelog b2e9ee7
@dchelimsky dchelimsky Revert "Make sure nested at_exit blocks don't break exit status"
This reverts commit c24caf6.
@dchelimsky dchelimsky Revert "changelog"
This reverts commit b2e9ee7.
Commits on Jun 25, 2011
@dchelimsky dchelimsky ci: use https for travis pass/fail badge 910df11
@dchelimsky dchelimsky Fix bug in which --pattern option was not being recognized.
The issue was that the pattern option was being processed after the files and/or directories
to run had been determined.

- Fixes #414
@dchelimsky dchelimsky Don't prepend the pattern with a directory if it is already part of t…
…he pattern.

- Fixes #415.
@dchelimsky dchelimsky dev: Remove declaration of rspec_path in Rake task
- this had not been necessary since we introduced bundler to the dev
  environment, but it never caused a problem until we moved the location
  of the rspec exe.

- Fixes #411.
Commits on Jun 28, 2011
@dchelimsky dchelimsky fewer warnings 893d202
Commits on Jun 29, 2011
@RobertLowe RobertLowe Make textmate formatter run pretty 9ec353f
Commits on Jul 01, 2011
@dchelimsky dchelimsky Do prepend the pattern with the directory if it doesn't _start_ with …
…the directory
@dchelimsky dchelimsky -cutables 0f55f0f
@dchelimsky dchelimsky more warning reduction 9189a22
@justinko justinko Merge pull request #419 from RobertLowe/master
Make textmate formtatter run prettier
@justinko justinko remove rails specific code 65e69cb
Commits on Jul 02, 2011
@dchelimsky dchelimsky dev: fix spec to align w/ changes to failure messages in rspec-mocks f191280
@dchelimsky dchelimsky dev: fix cukes to align w/ changes to failure messages in rspec-expec…
Commits on Jul 03, 2011
@dchelimsky dchelimsky add wip cuke showing how to run a spec with the ruby command
- this passes against 2.6.4, but fails against the current code,
  probably related to #379
  (which turns out to be a dup of #14)
Commits on Jul 05, 2011
@justinko justinko unnecessary one-liner a44c83b
Commits on Jul 09, 2011
@dchelimsky dchelimsky dev: more "should ==" to "should eq" ddbe258
Commits on Jul 12, 2011
@zeljkofilipin zeljkofilipin list of available formatters aee68e5
@dchelimsky dchelimsky Merge pull request #423 from zeljkofilipin/format-option
add list of available formatters to --format option feature
Commits on Jul 14, 2011
@dchelimsky dchelimsky doc tweaks 58ca629
@dchelimsky dchelimsky fix gherkin lexing problem d634edb
@dchelimsky dchelimsky dev: upgrade cucumber f995279
@dchelimsky dchelimsky only use default_path when run with rspec e7bb363
Commits on Jul 17, 2011
@dchelimsky dchelimsky prepend 'bundle exec' in rake task
- Fixes #426.
@jwilger jwilger Output failures occurring in pending blocks
When using #pending with a block inside an example, it's nice to be able to
see what is still failing within that block. This is particularly useful for
an acceptance test, e.g. when using Capybara, because you may not want your CI
server to fail the build when committing work against an incomplete feature,
but you still want to see the relevant failures. This is analogous to using a
@wip tag with cucumber tests.
@dchelimsky dchelimsky regen gold-masters for html and textmate formatter specs 41fbbf9
@dchelimsky dchelimsky more parens/fewer warnings (ruby-1.8.6) a9e5709
@dchelimsky dchelimsky update ruby-prof 69ff670
Commits on Jul 18, 2011
@myronmarston myronmarston Fix doc string to match example. 48d667a
@myronmarston myronmarston Error out on the problematic configs rather than warning when a group
has been defined.
Commits on Jul 22, 2011
@JackDanger JackDanger Fixing grammatical typo in command-line description.
'load files those matching' -> 'load files matching'
Commits on Jul 23, 2011
@justinko justinko Merge pull request #429 from JackDanger/patch-1
Fixing grammatical typo in command-line description.
Commits on Jul 24, 2011
@dchelimsky dchelimsky dev: add spork 8f44f46
@dchelimsky dchelimsky dev: stub a valid return value in spec 728814b
Commits on Jul 31, 2011
@dchelimsky dchelimsky bump the aruba timeout to 15 seconds - shouldn't really need that muc…
…h time, but silly to fail the build when some other process is hogging resources
Commits on Aug 01, 2011
@myronmarston myronmarston Fix formatting of configuration snippet. e5d98ca
@dchelimsky dchelimsky disable drb spec when offline 38f312f
Commits on Aug 02, 2011
@dchelimsky dchelimsky fake spork in spec helper if not available 1dae214
Commits on Aug 05, 2011
@slawosz slawosz add better error message when shared context is missing
- Closes #432.
@dchelimsky dchelimsky changes and slight tweaks from previous commit
- #432.
@dchelimsky dchelimsky even cleaner (better message and more signal in spec)
- #432.
@dchelimsky dchelimsky delegate shared content search to single method and align error messages
- #432.
@dchelimsky dchelimsky add formatter gold masters for ruby 1.9.3 78024c2
Commits on Aug 07, 2011
@johnbintz johnbintz clear formatters between runs
- Closes #435.
@dchelimsky dchelimsky Clear formatters rather than creating new array object, and split exa…
…mple for config.reset

- #435
Commits on Aug 08, 2011
Pivotal Casebook Include ::Rake::DSL to avoid deprecation warnings in newer versions o…
…f rake.
@justinko justinko Merge pull request #437 from pivotal-casebook/patch-1
Prevent deprecation warnings in newer rake versions
Commits on Aug 09, 2011
@justinko justinko changelog 7df9b24
Commits on Aug 14, 2011
@dchelimsky dchelimsky Only require "rspec/autorun" implicitly when using the `rspec` command.
This is a backward incompatible change, but is a fair tradeoff given the
problems caused by implicit require of "rspec/autorun" in cases that
rspec can not control.

- Closes #431.
@dchelimsky dchelimsky changes 71a9740
Commits on Aug 15, 2011
@dchelimsky dchelimsky Only include Rake::DSL if it is defined.
It is not defined in 0.8.7, which we still need to support.

- #437
Commits on Aug 17, 2011
@jeroenvandijk jeroenvandijk Fix travis images url e90730d
@dchelimsky dchelimsky Merge pull request #441 from jeroenvandijk/patch-1
Fix travis image url
Commits on Aug 22, 2011
@dchelimsky dchelimsky update a couple of dev dependencies 7ab7f08
@dchelimsky dchelimsky dev: require 'rspec/autorun' (for rcov) b8bf05e
@dblock dblock at_exit hax to ensure that rspec's exit code wins.
- Closes #410.
@dchelimsky dchelimsky more at_exit hax to play nice w/ rcov dc290d3
@dblock dblock Add cuke scenario when another at_exit hook is added later after rspe…
@dchelimsky dchelimsky modify scenario to not explicitly set a diff exit code ea322b9
Commits on Aug 23, 2011
@dchelimsky dchelimsky Restore old at_exit hook. This leaves #410 open and unresolved.
Also tweak the 'upstream at_exit{exit 0}' cuke to fail correctly, but
leave it tagged @wip.
Commits on Aug 25, 2011
@dchelimsky dchelimsky Add xspecify and xexample as temp pending hooks.
Thanks to Ben Mabey for the suggestion.
@dchelimsky dchelimsky dev: include rcov w/ jruby env 7cf6233
@dchelimsky dchelimsky Use : as file separator when passing args to rcov.
This is based on rcov's own command line documentation.

- Closes #307.
- Reverses #289.
Commits on Aug 29, 2011
@iain iain Turn off drb from the command line.
- Closes #450.
@dchelimsky dchelimsky Changelog plus additional examples for previous commit
- #450.
Commits on Aug 31, 2011
@dchelimsky dchelimsky dev: tweak some examples 9930ff4
Commits on Sep 06, 2011
@dchelimsky dchelimsky Provide a more accurate run time by registering start time before cod…
…e is loaded.
@dchelimsky dchelimsky changelog 28c1b57
Commits on Sep 22, 2011
@kellyfelkins kellyfelkins spec task should find spec files when a symlink is present a500cad
Commits on Sep 26, 2011
@dchelimsky dchelimsky Refactor any/all_apply? in example_group, example, and metadata. da80d2e
Commits on Sep 30, 2011
@dchelimsky dchelimsky refactor: rename superclass_metadata to parent_group_metadata 0896edf
@dchelimsky dchelimsky delay evaluation of full_description (don't always need it) 87354eb
Commits on Oct 01, 2011
@dchelimsky dchelimsky ci: stick to travis-supported rubies 111b619
@dchelimsky dchelimsky lazy eval description, full_description, and describes
- doesn't have much impact yet since the autogen descriptions still
  check for the presence of description, therefore it gets eval'd, but
  that is fixable!
@dchelimsky dchelimsky ignore rbx files 7701944
@dchelimsky dchelimsky what's this? I don't know!! REMOVE IT!!! 58964da
@dchelimsky dchelimsky dev: update Gemfile for ruby-1.9.3 39a074a
@scrummyin scrummyin fix for html formatter pulling the wrong snippets 89530e6
@dchelimsky dchelimsky Make sure textmate formatter doesn't try to get snippet from textmate…
…-formatted URL.

- Closes #214.
@dchelimsky dchelimsky Revert "Refactor any/all_apply? in example_group, example, and metada…

This reverts commit da80d2e, which
introduced failures in some rubies, but not all (so I didn't notice
@dchelimsky dchelimsky Do-over: Refactor any/all_apply? in example_group, example, and metad…

This restores 13f6889 with small
adjustment that is necessary for some versions of Ruby, but not all :)
@dchelimsky dchelimsky Changelog for #214 e666dd1
@dchelimsky dchelimsky One more time: revert "Do-over: Refactor any/all_apply? in example_gr…
…oup, example, and metadata."

This reverts commit bad6adc.
@dchelimsky dchelimsky And, once again: Refactor any/all_apply? in example_group, example, a…
…nd metadata.

This reverts commit 1680d32.

The problem was world was checking example.any_apply? which also checks
its example group. By going directly to the example's
metadata.any_apply?, we avoid checking the example group and all is
right with the world.
@dchelimsky dchelimsky remove unused method 50f8055
Commits on Oct 02, 2011
@dchelimsky dchelimsky Merge pull request #459 from kellyfelkins/master
Enable the spec task to traverse symlinked directories
@dchelimsky dchelimsky simplify spec for rake task with paths with symlinked dirs f300e81
@dchelimsky dchelimsky Use glob pattern that supports real and symlinked dirs as well as imm…
…ediate children.

- #459
@dchelimsky dchelimsky Changelog for #459 ca3c0fc
@dchelimsky dchelimsky Ensure support for overriding described class.
Fixes bug introduced by 0704cbb and
exposed in rspec-rails.

Also refactored some names in Metadata.
@dchelimsky dchelimsky Fix full description generation bug 810895a
@dchelimsky dchelimsky reorg and add some docs to Metadata 25b1ff5
Commits on Oct 03, 2011
@dchelimsky dchelimsky nested group returns own described class if parent doesn't have one 2336a7f
Commits on Oct 08, 2011
@kaiwren kaiwren Increase Aruba's timeout to compensate for JVM startup
- Closes #344.
@dchelimsky dchelimsky ci: add jruby to travis config
- #344.
Commits on Oct 09, 2011
@dchelimsky dchelimsky remove java class files from cleaned JRuby backtraces 7fb9b62
@dchelimsky dchelimsky ci: don't run against jruby on travis
Travis has a 1500 second build timeout. Firing up a new jvm for each
cuke scenario causes this build to exceed that time.
@dchelimsky dchelimsky Deprecate skip_bundler and gemfile options on rake task. Check for
presence of BUNDLE_GEMFILE instead.

- Closes #454.
@dchelimsky dchelimsky bump to 2.7.0.rc1 ade146c
@dchelimsky dchelimsky bump relish version to ~> 0.5.0 708a4f1
@dchelimsky dchelimsky Don't do anything with bundler at all - bundler does it for us!
See #454 for more info.

- #454
@dchelimsky dchelimsky changelog for last commit 78abc61
@dchelimsky dchelimsky better changelog ... 59ddb79
Commits on Oct 10, 2011
@dchelimsky dchelimsky more Upgrade info 8e0b53f
@dchelimsky dchelimsky doc: tweak the upgrade page 03b4c5c
Commits on Oct 12, 2011
@cgriego cgriego Add --failure-exit-code option 2d98e91
@dchelimsky dchelimsky Merge pull request #472 from cgriego/failure-exit-code
Add --failure-exit-code option
@dchelimsky dchelimsky changelog 7ef7112
Commits on Oct 14, 2011
@sumbach sumbach Fix typo in feature description a18fdfb
@myronmarston myronmarston Merge pull request #474 from sumbach/patch-1
Fix typo in feature description
Commits on Oct 16, 2011
@dchelimsky dchelimsky Make the source more yardoc friendly
- added .yardopts
- removed :nodoc: tags
@dchelimsky dchelimsky remove obsolete install_directory method 7bed578
@dchelimsky dchelimsky clean up some of the generated rdoc ff3510b
@dchelimsky dchelimsky update changelog for 2.7.0 release 5bd1ccf
@dchelimsky dchelimsky bump version to 2.7.0 b4a0f7d
@dchelimsky dchelimsky fix formatting problems in the changelog 869855b
Commits on Oct 17, 2011
@dchelimsky dchelimsky tell autotest the correct place to find the rspec command
- Fixes #478.
Commits on Oct 20, 2011
@dchelimsky dchelimsky RSPEC_EXECUTABLE (better name) 67a5d26
@dchelimsky dchelimsky bump to 2.7.1 d63dc5d