Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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.11.0
...
head fork: rspec/rspec-core
compare: extract_backtrace_filtering
Commits on Jul 07, 2012
@dchelimsky dchelimsky improve automation for publishing to relishapp.com 394e356
Commits on Jul 11, 2012
@myronmarston myronmarston Fix ruby warnings.
- lib/rspec/core/shared_example_group.rb:41: warning: `&' interpreted as argument prefix
- spec/rspec/core/configuration_spec.rb:86: warning: ambiguous first argument; put parentheses or even spaces
- spec/rspec/core/configuration_spec.rb:182: warning: ambiguous first argument; put parentheses or even spaces
- spec/rspec/core/option_parser_spec.rb:71: warning: possibly useless use of == in void context

Closes #645.
9a2f2c5
Commits on Jul 12, 2012
@myronmarston myronmarston Don't override #ancestors.
This is a core ruby method we shouldn't touch. Instead, define #parent_groups.

Closes #646.
9e8b6b9
Commits on Jul 13, 2012
@myronmarston myronmarston Make it so that other top-level DSL methods are not added to every ob…
…ject.

I did this for #describe in de01e05 but didn't notice that the shared example/context definition methods have the same issue.
3e82044
@myronmarston myronmarston Provide a more flexible ordering API.
For #547.
d0df8cb
@myronmarston myronmarston Refactor ordering/randomization logic in terms of new APIs.
For #547.
d79960b
@myronmarston myronmarston Set #order to "custom" when providing a custom ordering block.
For #547.
542dfe8
@myronmarston myronmarston Use DEFAULT_ORDERING constant. c76f471
@myronmarston myronmarston Update change log. 09bc03d
@myronmarston myronmarston Combine a few specs into one.
There's not much value in keeping these as separate individual specs--no needed for the added overhead of 3 specs when one will suffice here.
7ca3c01
@joliss joliss Fix typo
This used to be a multi-line string with "',\n    '" in it.
d8e3982
@justinko justinko Merge pull request #648 from joliss/typo
Fix typo
bf66db3
@rsperberg rsperberg Corrected misspelling of expectations 740a70f
@rsperberg rsperberg Added backticks around run_all_when_everything_filtered to prevent ge…
…nerating <em> tag
a094493
@rsperberg rsperberg Added backticks around setup_mocks_for_rspec etc to prevent underscor…
…es becoming <em> tags
3c99b70
@rsperberg rsperberg Corrected three misspellings of "arbitrary" 58967b4
@justinko justinko Merge pull request #649 from rsperberg/master
Typos in documentation
91b97be
Commits on Jul 16, 2012
@myronmarston myronmarston Fix the way we autoload RSpec::Matchers.
`autoload`, besides being deprecated by Matz, does not work to require files
that are in unactivated gems--it only works with ruby's built in require, for
files that are available relative to a directory on the load path. Instead,
we use `const_missing` to make it work.

Closes #647.
e6ecc0b
@myronmarston myronmarston Don't pollute every object in the system with a method like `require_…
…rspec`.

Instead use a local variable lambda. To make this work I had to move the
"core/extensions/*" requires into rspec/core.rb, but I think this is a
good change, anyway…given the well-known performance issues with require
on MRI 1.9.2, this change will remove one extra require.
9579895
Commits on Jul 18, 2012
@myronmarston myronmarston Ignore mock expectation failures when the example has already failed.
Mock expectation failures have always been ignored in this situation,
but due to my changes in 27059bf it was printing a confusing message.

Closes #651.
e22ce0b
@myronmarston myronmarston Fix ruby warnings.
- lib/rspec/core/shared_example_group.rb:41: warning: `&' interpreted as argument prefix
- spec/rspec/core/configuration_spec.rb:86: warning: ambiguous first argument; put parentheses or even spaces
- spec/rspec/core/configuration_spec.rb:182: warning: ambiguous first argument; put parentheses or even spaces
- spec/rspec/core/option_parser_spec.rb:71: warning: possibly useless use of == in void context

Closes #645.
1f78187
@joliss joliss Fix typo
This used to be a multi-line string with "',\n    '" in it.
e75df2c
@myronmarston myronmarston Fix the way we autoload RSpec::Matchers.
`autoload`, besides being deprecated by Matz, does not work to require files
that are in unactivated gems--it only works with ruby's built in require, for
files that are available relative to a directory on the load path. Instead,
we use `const_missing` to make it work.

Closes #647.
2e32d6e
@myronmarston myronmarston Update change log. c2ea08c
@myronmarston myronmarston Ignore mock expectation failures when the example has already failed.
Mock expectation failures have always been ignored in this situation,
but due to my changes in 27059bf it was printing a confusing message.

Closes #651.
30e81b5
Commits on Jul 19, 2012
@myronmarston myronmarston 2.11.1 release. b819726
@myronmarston myronmarston Merge branch '2-11-maintenance'
Conflicts:
	Changelog.md
340eb56
Commits on Jul 31, 2012
Sam Goldman Fix Metadata#fetch to support computed values.
If example.metadata.fetch(:description) was called before example.metadata[:description], fetch would raise a KeyError.
b28da55
Commits on Aug 01, 2012
@dchelimsky dchelimsky Merge pull request #657 from samwgoldman/fetch
Fix Metadata#fetch to support computed values.
215bdb4
@dchelimsky dchelimsky Changelog for #657. 07be957
Commits on Aug 04, 2012
@moredip moredip start extracting HTML printing into a seperate class 38306ae
@moredip moredip more WIP moving extracting HtmlPrinter b6c9c14
@moredip moredip more WIP on HtmlPrinter extraction - main flow done 4433bd8
@moredip moredip pretty much all HTML is now extracted into HtmlPrinter 2f005dc
@moredip moredip HtmlPrinter: define big blocks of html with constants rather than met…
…hods
a8ef955
@moredip moredip Cleaning up last bits of cruft from HtmlFormatter refactor b18a575
@moredip moredip Use 1.8.x hash syntax 7b387ae
@moredip moredip fix typo 67227f3
Commits on Aug 15, 2012
@dchelimsky dchelimsky dev: use debugger gem for ruby 1.9 d833934
Commits on Aug 17, 2012
@alexch alexch ignore .idea (RubyMine project files) f0ebce3
@alexch alexch Restore json formatter
This reverts commit ed9ec72.
7e076bc
@alexch alexch fix up tests for JsonFormatter d549bc8
@alexch alexch add --format json to the command-line option parser 0496c0a
@alexch alexch fix a few more tests on 1.8.7 and JRuby 72efe86
@alexch alexch curse you, randomly ordered hashes\! a0e4fa6
@dchelimsky dchelimsky Merge pull request #661 from alexch/json-formatter
JSON formatter
cb2e14a
Commits on Aug 18, 2012
@dchelimsky dchelimsky Changelog for #661 8752b9a
Commits on Aug 24, 2012
@myronmarston myronmarston Update build so that it runs specs together, then file-by-file.
We want to keep each spec passing on its own, so this is a good
way to ensure that. There were some missing requires, actually.

The test_all script is derived from a script from Gary Bernhardt:

https://github.com/garybernhardt/raptor/blob/master/script/test_all
d35b6b5
Commits on Aug 25, 2012
@myronmarston myronmarston Update script/test_all so that it runs specs w/o loading bundler.
As per rspec/rspec-mocks#174, we want all specs to pass when run in isolation w/o bundler being loaded, so this helps us ensure that remains true.

Also, running w/o bundler in this fashion is about 3x faster than using bundle exec.
c2dcdd4
@myronmarston myronmarston After running all specs, we only want to run cucumber.
...rather than running the specs again, and then cucumber.
4f101b3
Commits on Aug 31, 2012
@dchelimsky dchelimsky refactor spec for improved output f1ef071
@soulcutter soulcutter Documentation for RakeTask rspec_opts. Fixes #280 f920afc
Commits on Sep 01, 2012
@tomykaira tomykaira Named subject can be referred from an inside subject block
Example:

    describe "list" do
      subject(:list) { [1,2,3] }
      describe 'first' do
        subject(:first_element) { list.first }
        it { should eq(1) }
      end
    end

With the previous implementation, this fails with "stack level too deep".
This error is not obvious and irritating to me.

I believe this behaviour is more natural.
c83eaf9
@tomykaira tomykaira Use a simpler way to invoke a method by name b311627
@dchelimsky dchelimsky Merge pull request #670 from tomykaira/nest_named_subject
Named subject can be referred from an inside subject block in a nested group
6b286e6
@dchelimsky dchelimsky changelog for #670 4a061c7
Commits on Sep 03, 2012
@alindeman alindeman Merge pull request #671 from soulcutter/rspec_opts_docs
Documentation for RakeTask rspec_opts. Fixes #280
31516a0
@alindeman alindeman Also send test_all STDERR to STDOUT b7368ed
@dchelimsky dchelimsky refactor spec efa5c14
Commits on Sep 05, 2012
@soulcutter soulcutter Fixed #567 halt on toplevel before(:all) exceptions 36702f4
@myronmarston myronmarston Update changelog. c04b99a
Commits on Sep 08, 2012
@dchelimsky dchelimsky run should_clean gem (it "does v it "should) 400da5a
@myronmarston myronmarston Fix funny indentation. fcef568
@myronmarston myronmarston Use #stub_const rather than hand-rolled constant manipulation. 2ce7ee3
@myronmarston myronmarston Use some helper methods to manage ENV manipulation. e789ce2
@joliss joliss Make glob order alphabetical, not file-system dependent
Dir[] and FileList[] have undefined order, so sorting them is strictly
better than not. Sorting should not have a performance impact in any
realistic use case: Sorting 100k shuffled elements is
near-instantaneous, and sorting 1M elements takes ~3 seconds, so file
system access time will always dominate.

One particular reason why this is useful is that undefined ordering is a
major source of flickering test suite failures.
c76c1e6
@myronmarston myronmarston Add specs for the consistent ordering of the files to run.
These are for #660.
279a6d6
@myronmarston myronmarston Changlog entry for #660. 2bfe288
Commits on Sep 09, 2012
@dchelimsky dchelimsky Check output.tty? on each formatter's output instead of global setting.
This fixes a bug where color is config'd but a formatter is given a file.

- Fixes #675.
1852a7f
@dchelimsky dchelimsky minor refactoring for clarity 137201a
Commits on Sep 10, 2012
@myronmarston myronmarston Amend 279a6d6 based on @dchelimsky's code review comments. ced0638
@myronmarston myronmarston Remove obselete scripts we no longer need. ace84f8
@myronmarston myronmarston Use `stub_const` rather than defining an empty module.
The old way "leaked" in the sense that it globally added an empty
module that only a few tests need.
7c537b7
Commits on Sep 11, 2012
M. Scott Ford Outputs random seed before loading files
Ordering dependencies between files can result in a raised exception
when rspec is loading files. If random ordering is turned on, then the
exception will prevent the random seed from being displayed. This
always outputs the random seed before file are loaded, so that the
ordering that produced the exception can be repeated.
f6565c7
Commits on Sep 12, 2012
@moredip moredip refactor from keyword params to plain old vanilla params for HtmlPrinter
Did leave keyword params in for methods that took 5 or more params.
1732ed7
David Chelimsky update Gemfile-custom ddc2c37
David Chelimsky more custom Gemfile updates 29fb56e
@samphippen samphippen Break the rake task constructor up a bit
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
5412602
@samphippen samphippen Remove explicit "self." in the rake task
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
6b76ced
@samphippen samphippen Simplify instance variable creation
Before we were creating instance variables both before and after
yielding to the user. Now we set all defaults before we yield to the
user and then it's up to them to change any of the values.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
fffab90
Commits on Sep 13, 2012
@dchelimsky dchelimsky Merge pull request #677 from samphippen/refactor-rake-task
Refactor internals of the rake task constructor.
fb7f189
@dchelimsky dchelimsky changelog for #677 35eb45a
@samphippen samphippen Break the inline default spec command block into a method.
I think that it's cleaner to have this glob of functionality in it's
own method rather than starting a new block halfway through the
function.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
2538849
@samphippen samphippen Remove a duplicate "private" declaration in rake_task
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
db23e27
@dchelimsky dchelimsky Merge pull request #678 from samphippen/refactor-default-spec-command
Break up RakeTask#spec_command method.
43b4eb2
@patmaddox patmaddox Merge pull request #679 from samphippen/remove-rake-task-duplicate-pr…
…ivate

Remove a duplicate "private" declaration from rake_task.rb
f0eb079
Commits on Sep 15, 2012
@moredip moredip remove last two usages of keyword params from HtmlPrinter 77e7ef4
@dchelimsky dchelimsky Merge pull request #659 from moredip/pr/html_formatter_cleanup
Clean up html formatter
20268ed
@dchelimsky dchelimsky changelog for #659 a1bf4fe
@dchelimsky dchelimsky reformat 410155e
@alindeman alindeman Quotes ruby command in case it contains spaces
* Closes #674
4d3b610
Commits on Sep 16, 2012
@twe4ked twe4ked Pluralize 'second' in RSpec::Core::Formatters::Helpers#format_duration.
Add `.to_f` to the pluralize method so it handles strings.
efeb497
Commits on Sep 17, 2012
M. Scott Ford Ensures that error commands always throw an error dbee8b6
@alindeman alindeman Fixes regression introduced by earlier refactoring in 5412602
* args was being double wrapped in an Array after being splatted twice
2a85bc7
@myronmarston myronmarston Merge pull request #676 from mscottford/output-seed-before-loading-files
Outputs random seed before loading files
fb0f06e
@myronmarston myronmarston Changelog for #676.
[ci skip]
824119e
Commits on Sep 26, 2012
@samphippen samphippen Ensure before(:all) state is always propagated to after(:all)
...even if an error occurs in before(:all).

Fixes #558.
49370db
@markburns markburns slightly more useful exception message in case of finding a duplicate…
… shared_example_group
34b17ed
@markburns markburns change to warning rather than raising ArgumentError when duplicate bl…
…ock called
8b0cb5a
@myronmarston myronmarston Fixup the improved duplicate shared example group warning.
- No need to stub the private formatted_location method.
- More detailed message.
- Changelog entry.
d2f831d
@myronmarston myronmarston Fix build on 1.8.7.
Proc#source_location is only available on 1.9, apparently.
a5b7209
@myronmarston myronmarston Refactor shared example code so we don't leak methods onto Module/main.
We should limit the number of methods we add onto objects we don't own.
21c415f
@samphippen samphippen Command line arguments consistently use hyphens
`--default_path` has been replaced with `--default-path` and `--line_number`
has been replaced with `--line-number`.

The old, underscore based args still work. The new hyphen based args now
show in the help text in `--help`.

Closes #497
Closes #691
ef74478
@alindeman alindeman Changelog for #497, #691 [ci skip] 92038d3
Commits on Sep 27, 2012
@alindeman alindeman "--init" no longer generates an incorrect warning
* Closes #693
* Fixes #686
336f201
@samphippen samphippen Deprecate SharedExampleGroup#share_as
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
aa294e7
@samphippen samphippen Add a spec for the share_as deprecation
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
faf6d4f
Commits on Sep 28, 2012
@jcarres-mdsol jcarres-mdsol A more useful error message is shown when an invalid command line opt…
…ion is used

* Closes #688
ccedfcb
@amatsuda amatsuda s/map/each/ 64fbdca
@dchelimsky dchelimsky Merge pull request #696 from amatsuda/load_each_file
avoid creating unused Array instance
5012aea
Commits on Oct 01, 2012
@myronmarston myronmarston Merge pull request #694 from samphippen/deprecate-share-as
Deprecate SharedExampleGroup#share_as
701f901
@myronmarston myronmarston Silence share_as deprecation warning in our specs. 5882cff
@myronmarston myronmarston Fix warning: already initialized constant NestedFoo2 cfb6029
@myronmarston myronmarston Update changelog. 94fd7a8
@myronmarston myronmarston Unify error message for invalid option.
No need to `puts` part of it and `abort` with the rest.
45f23ab
Commits on Oct 03, 2012
@alex-tan alex-tan Add format_docstrings option to configuration. 4fd3882
@myronmarston myronmarston Changelog for #698.
[ci skip]
ffeda87
@myronmarston myronmarston Don't output the seed before loading spec files.
This sets the formatter before users have a chance to
configure it in a `RSpec.configure` block in a loaded
spec file, and it turns out we don't need it--#660
fixes the order files are loaded to a consistent order,
so the seed isn't involved at file load time.

This reverts the following commits:

* "Changelog for #676."
  (824119e)
* "Ensures that error commands always throw an error"
  (dbee8b6)
* "Outputs random seed before loading files"
  (f6565c7)

Closes #676.
3301d30
Commits on Oct 04, 2012
@blowmage blowmage Remove unnecessary require
The rake task doesn't use core, and doesn't need the DSL loaded to work.
Having core loaded stomps on minitest if in the same project.
92c48a4
Commits on Oct 05, 2012
@dchelimsky dchelimsky Merge pull request #700 from blowmage/minitest-rails
Allow RSpec's rake task to live with MiniTest
b45066f
@myronmarston myronmarston Rearrange code to keep ordering config options together. 8b461d3
@dchelimsky dchelimsky Use dup of Time so reporting isn't clobbered by examples that modify …
…Time

without properly restoring it.
51a31c9
Commits on Oct 06, 2012
@myronmarston myronmarston Delegate #configuration through to rspec-mocks.
This allows our block config API to be used.

This depends on rspec/rspec-mocks#188 and should be merged after that.
44ff59b
@myronmarston myronmarston Time.new doesn't accept any arguments on 1.8.7.
It's an alias for Time.now.
1bd9815
@myronmarston myronmarston Build on all rbx/jruby interpreters available.
...but allow failures for now (since I don't know if they'll pass initially).
e052419
@myronmarston myronmarston Relax time threshold.
If GC kicks in at the right moment, it could take a fair bit longer.
ffb48f5
@dchelimsky dchelimsky Merge pull request #681 from twe4ked/pluralize-seconds
Pluralize 'second' in RSpec::Core::Formatters::Helpers#format_duration
1a57965
@dchelimsky dchelimsky Changelog for #681 f6e707d
Commits on Oct 07, 2012
@jarmo jarmo Fix ANSICON url. 4835159
@dchelimsky dchelimsky Merge pull request #702 from jarmo/master
Fix ANSICON url.
4a67c9f
@dchelimsky dchelimsky Changelog for #702 5087344
@dchelimsky dchelimsky warn when RSpec.configuration receives a block (use RSpec.configure f…
…or that)
0c8cf26
Commits on Oct 08, 2012
@myronmarston myronmarston JRuby 1.8 is passing fine. f2d7105
Commits on Oct 09, 2012
@myronmarston myronmarston Extract BacktraceFormatters into a module.
This will be used by rspec/rspec-expectations#59.
39857f3