Skip to content

HTTPS clone URL

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.6.3
...
head fork: rspec/rspec-core
compare: v2.6.4
Checking mergeability… Don't worry, you can still create the pull request.
  • 18 commits
  • 17 files changed
  • 0 commit comments
  • 5 contributors
Commits on May 22, 2011
@tsigo tsigo Fix indentation warnings; Closes #352 aadc7b6
Commits on May 23, 2011
@dchelimsky dchelimsky dev: remove unnecessary monkey patch of Cucumber 7e34411
@dchelimsky dchelimsky ci: bundle exec rake (to ensure compatibility w/ downstream deps) b13d0f1
Commits on May 24, 2011
@dchelimsky dchelimsky Merge in changes from 2-6-maintenance branch
- no functional changes, just dev dependencies, configs, and changelog
c3d9f1b
@yannlugrin yannlugrin Allow tag exclusion filtering when using drb b6a71b7
Commits on May 26, 2011
@dchelimsky dchelimsky ci: run against rbx and jruby c57f529
@justinko justinko Merge pull request #384 from tsigo/master
Fix indentation warnings; Closes #352
3cab6c2
@mcmire mcmire Fix --example option so that it is not double-escaped when running te…
…sts over DRb
28e1393
@justinko justinko Merge pull request #387 from yannlugrin/drb_with_exclusion_tags
Allow tag exclusion filtering when using drb
4ef0c29
@justinko justinko changelog 17bb5a3
Commits on May 27, 2011
@justinko justinko Merge pull request #388 from mcmire/unescape_escaped_example_option_o…
…ver_drb

Fix for --example so that it is not double-escaped when running tests over DRb
dcd919c
@justinko justinko slight refactor dd29b29
@justinko justinko changelog 3db6c4c
@dchelimsky dchelimsky process the name instead of using TYPE constants 4a5aa01
Commits on Jun 02, 2011
@dchelimsky dchelimsky add some docs and move some things around 3e98111
Commits on Jun 04, 2011
@dchelimsky dchelimsky use cyan for comments (instead of grey, which is not an ansi standard)
- Fixes #393
0e746a8
Commits on Jun 06, 2011
@dchelimsky dchelimsky move Changelog to project dir and copy it to features when deploying …
…relish docs
74aa307
@dchelimsky dchelimsky bump to 2.6.4 682f9a1
View
4 .travis.yml
@@ -1,7 +1,9 @@
-script: "rake"
+script: "bundle exec rake"
rvm:
- 1.8.6
- 1.8.7
- 1.9.1
- 1.9.2
- ree
+ - rbx
+ - jruby
View
17 features/Changelog.md → Changelog.md
@@ -1,15 +1,22 @@
-### 2.6.3 / not released
+### 2.6.4 / 2011-06-06
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...master)
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.3...v2.6.4)
-* Minor output enhancment
- * Add dump of shell commands to re-run failed examples
+* Bug fixes
+ * Support exclusion filters in DRb. (Yann Lugrin)
+ * Fix --example escaping when run over DRb. (Elliot Winkler)
+ * Use standard ANSI codes for color formatting so colors work in a wider set
+ of color schemes.
+
+### 2.6.3 / 2011-05-24
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...v2.6.3)
* Bug fixes
* Explicitly convert exit code to integer, avoiding TypeError when return
value of run is IO object proxied by `DRb::DRbObject` (Julian Scheid)
* Clarify behavior of `--example` command line option
-
+ * Build using a rubygems-1.6.2 to avoid downstream yaml parsing error
### 2.6.2 / 2011-05-21
View
2  Gemfile
@@ -11,7 +11,7 @@ source "http://rubygems.org"
end
### dev dependencies
-gem "rake", "~> 0.8"
+gem "rake", "~> 0.9"
gem "cucumber", "~> 0.10.2"
gem "aruba", "~> 0.3.6"
gem "rcov", "0.9.9", :platforms => :mri
View
17 Rakefile
@@ -23,21 +23,9 @@ require "rake/rdoctask"
require "rspec/core/rake_task"
require "rspec/core/version"
-cucumber_loaded = false
-
begin
require "cucumber/rake/task"
-
Cucumber::Rake::Task.new(:cucumber)
-
- class Cucumber::Rake::Task::ForkedCucumberRunner
- # When cucumber shells out, we still need it to run in the context of our
- # bundle.
- def run
- sh "bundle exec #{RUBY} " + args.join(" ")
- end
- end
- cucumber_loaded = true
rescue LoadError => e
puts "unable to load cucumber, some tasks unavailable"
task :cucumber do
@@ -52,7 +40,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
t.verbose = false
end
-
namespace :rcov do
task :cleanup do
rm_rf 'coverage.data'
@@ -64,7 +51,7 @@ namespace :rcov do
t.rcov_opts << %[--no-html --aggregate coverage.data]
end
- if cucumber_loaded
+ if defined?(Cucumber)
Cucumber::Rake::Task.new :cucumber do |t|
t.cucumber_opts = %w{--format progress}
t.rcov = true
@@ -92,7 +79,9 @@ end
desc "Push docs/cukes to relishapp using the relish-client-gem"
task :relish, :version do |t, args|
raise "rake relish[VERSION]" unless args[:version]
+ sh "cp Changelog.md features/"
sh "relish push rspec/rspec-core:#{args[:version]}"
+ sh "rm features/Changelog.md"
end
Rake::RDocTask.new do |rdoc|
View
6 lib/rspec/core.rb
@@ -1,3 +1,4 @@
+require 'rspec/core/dsl'
require 'rspec/core/extensions'
require 'rspec/core/load_path'
require 'rspec/core/deprecation'
@@ -39,14 +40,17 @@ def self.install_directory
end
end
+ # Used internally to determine what to do when a SIGINT is received
def self.wants_to_quit
world.wants_to_quit
end
+ # Used internally to determine what to do when a SIGINT is received
def self.wants_to_quit=(maybe)
world.wants_to_quit=(maybe)
end
+ # Internal container for global non-configuration data
def self.world
@world ||= RSpec::Core::World.new
end
@@ -58,6 +62,7 @@ def self.reset
configuration.reset
end
+ # Returns the global configuration object
def self.configuration
@configuration ||= RSpec::Core::Configuration.new
end
@@ -74,6 +79,7 @@ def self.configure
yield configuration if block_given?
end
+ # Used internally to clear remaining groups when fail_fast is set
def self.clear_remaining_example_groups
world.example_groups.clear
end
View
21 lib/rspec/core/configuration_options.rb
@@ -12,15 +12,15 @@ def configure(config)
keys = options.keys
keys.unshift(:requires) if keys.delete(:requires)
keys.unshift(:libs) if keys.delete(:libs)
-
+
formatters = options[:formatters] if keys.delete(:formatters)
-
+
config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
-
+
keys.each do |key|
config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
end
-
+
formatters.each {|pair| config.add_formatter(*pair) } if formatters
end
@@ -33,12 +33,23 @@ def drb_argv
argv << "--fail-fast" if options[:fail_fast]
argv << "--line_number" << options[:line_number] if options[:line_number]
argv << "--options" << options[:custom_options_file] if options[:custom_options_file]
- argv << "--example" << options[:full_description].source if options[:full_description]
+ if options[:full_description]
+ # The argument to --example is regexp-escaped before being stuffed
+ # into a regexp when received for the first time (see OptionParser).
+ # Hence, merely grabbing the source of this regexp will retain the
+ # backslashes, so we must remove them.
+ argv << "--example" << options[:full_description].source.delete('\\')
+ end
if options[:filter]
options[:filter].each_pair do |k, v|
argv << "--tag" << k.to_s
end
end
+ if options[:exclusion_filter]
+ options[:exclusion_filter].each_pair do |k, v|
+ argv << "--tag" << "~#{k.to_s}"
+ end
+ end
if options[:formatters]
options[:formatters].each do |pair|
argv << "--format" << pair[0]
View
6 lib/rspec/core/extensions/object.rb → lib/rspec/core/dsl.rb
@@ -1,6 +1,6 @@
module RSpec
module Core
- module ObjectExtensions
+ module DSL
def describe(*args, &example_group_block)
RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
end
@@ -8,6 +8,4 @@ def describe(*args, &example_group_block)
end
end
-class Object
- include RSpec::Core::ObjectExtensions
-end
+include RSpec::Core::DSL
View
2  lib/rspec/core/expecting/with_rspec.rb
@@ -3,9 +3,7 @@
module RSpec
module Core
module ExpectationFrameworkAdapter
-
include RSpec::Matchers
-
end
end
end
View
1  lib/rspec/core/extensions.rb
@@ -1,4 +1,3 @@
-require 'rspec/core/extensions/object'
require 'rspec/core/extensions/kernel'
require 'rspec/core/extensions/instance_eval_with_args'
require 'rspec/core/extensions/module_eval_with_args'
View
34 lib/rspec/core/formatters/base_text_formatter.rb
@@ -49,7 +49,7 @@ def dump_commands_to_rerun_failed_examples
output.puts
failed_examples.each do |example|
- output.puts(red("rspec #{BaseFormatter::relative_path(example.location)}") + " " + grey("# #{example.full_description}"))
+ output.puts(red("rspec #{BaseFormatter::relative_path(example.location)}") + " " + cyan("# #{example.full_description}"))
end
end
@@ -58,7 +58,7 @@ def dump_profile
output.puts "\nTop #{sorted_examples.size} slowest examples:\n"
sorted_examples.each do |example|
output.puts " #{example.full_description}"
- output.puts grey(" #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
+ output.puts cyan(" #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
end
end
@@ -75,8 +75,8 @@ def dump_pending
output.puts "Pending:"
pending_examples.each do |pending_example|
output.puts yellow(" #{pending_example.full_description}")
- output.puts grey(" # #{pending_example.execution_result[:pending_message]}")
- output.puts grey(" # #{format_caller(pending_example.location)}")
+ output.puts cyan(" # #{pending_example.execution_result[:pending_message]}")
+ output.puts cyan(" # #{format_caller(pending_example.location)}")
end
end
end
@@ -95,20 +95,12 @@ def bold(text)
color(text, "\e[1m")
end
- def white(text)
- color(text, "\e[37m")
- end
-
- def green(text)
- color(text, "\e[32m")
- end
-
def red(text)
color(text, "\e[31m")
end
- def magenta(text)
- color(text, "\e[35m")
+ def green(text)
+ color(text, "\e[32m")
end
def yellow(text)
@@ -119,8 +111,16 @@ def blue(text)
color(text, "\e[34m")
end
- def grey(text)
- color(text, "\e[90m")
+ def magenta(text)
+ color(text, "\e[35m")
+ end
+
+ def cyan(text)
+ color(text, "\e[36m")
+ end
+
+ def white(text)
+ color(text, "\e[37m")
end
def short_padding
@@ -143,7 +143,7 @@ def format_caller(caller_info)
def dump_backtrace(example)
format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
- output.puts grey("#{long_padding}# #{backtrace_info}")
+ output.puts cyan("#{long_padding}# #{backtrace_info}")
end
end
View
9 lib/rspec/core/hooks.rb
@@ -8,7 +8,7 @@ class Hook
def initialize(options, &block)
@options = options
- raise "no block given for #{self.class::TYPE} hook" unless block
+ raise "no block given for #{display_name}" unless block
@block = block
end
@@ -23,10 +23,13 @@ def to_proc
def call
@block.call
end
+
+ def display_name
+ self.class.name.split('::').last.gsub('Hook','').downcase << " hook"
+ end
end
class BeforeHook < Hook
- TYPE = 'before'
def run_in(example_group_instance)
if example_group_instance
example_group_instance.instance_eval(&self)
@@ -37,7 +40,6 @@ def run_in(example_group_instance)
end
class AfterHook < Hook
- TYPE = 'after'
def run_in(example_group_instance)
if example_group_instance
example_group_instance.instance_eval_with_rescue(&self)
@@ -48,7 +50,6 @@ def run_in(example_group_instance)
end
class AroundHook < Hook
- TYPE = 'around'
def call(wrapped_example)
@block.call(wrapped_example)
end
View
2  lib/rspec/core/metadata_hash_builder.rb
@@ -87,7 +87,7 @@ def symbol_metadata_warning(symbols)
NOTICE
end
- end
end
+ end
end
end
View
2  lib/rspec/core/version.rb
@@ -1,7 +1,7 @@
module RSpec # :nodoc:
module Core # :nodoc:
module Version # :nodoc:
- STRING = '2.6.3.beta1'
+ STRING = '2.6.4'
end
end
end
View
29 spec/rspec/core/configuration_options_spec.rb
@@ -14,7 +14,7 @@ def parse_options(*args)
config_options_object(*args).options
end
- it "warns when HOME env var is not set" do
+ it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
begin
orig_home = ENV.delete("HOME")
coo = RSpec::Core::ConfigurationOptions.new([])
@@ -41,7 +41,7 @@ def parse_options(*args)
config.should_receive(:add_formatter).ordered
opts.configure(config)
end
-
+
it "merges the :exclusion_filter option with the default exclusion_filter" do
opts = config_options_object(*%w[--tag ~slow])
config = RSpec::Core::Configuration.new
@@ -223,17 +223,38 @@ def parse_options(*args)
config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
end
+ context "with --example" do
+ it "includes --example" do
+ config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
+ end
+
+ it "unescapes characters which were escaped upon storing --example originally" do
+ config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
+ end
+ end
+
context "with tags" do
- it "includes the tags" do
+ it "includes the inclusion tags" do
coo = config_options_object("--tag", "tag")
coo.drb_argv.should eq(["--tag", "tag"])
end
- it "leaves tags intact" do
+ it "leaves inclusion tags intact" do
coo = config_options_object("--tag", "tag")
coo.drb_argv
coo.options[:filter].should eq( {:tag=>true} )
end
+
+ it "includes the exclusion tags" do
+ coo = config_options_object("--tag", "~tag")
+ coo.drb_argv.should eq(["--tag", "~tag"])
+ end
+
+ it "leaves exclusion tags intact" do
+ coo = config_options_object("--tag", "~tag")
+ coo.drb_argv
+ coo.options[:exclusion_filter].should eq( {:tag=>true} )
+ end
end
context "with formatters" do
View
36 spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
@@ -312,18 +312,14 @@
<span class="failed_spec_name">fails</span>
<div class="failure" id="failure_1">
<div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
- <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
- <pre class="ruby"><code><span class="linenum">24</span> <span class="keyword">rescue</span> <span class="constant">Exception</span>
-<span class="linenum">25</span> <span class="keyword">end</span>
-<span class="offending"><span class="linenum">26</span> <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">27</span> <span class="keyword">end</span>
-<span class="linenum">28</span> <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
+ <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
+ <pre class="ruby"><code><span class="linenum">29</span> <span class="ident">teardown_mocks_for_rspec</span>
+<span class="linenum">30</span> <span class="keyword">end</span>
+<span class="offending"><span class="linenum">31</span> <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">32</span> <span class="keyword">end</span>
+<span class="linenum">33</span> <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
</div>
</dd>
</dl>
@@ -350,13 +346,9 @@
(compared using ==)
</pre></div>
- <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
+ <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
<pre class="ruby"><code><span class="linenum">27</span> <span class="keyword">end</span>
<span class="linenum">28</span>
<span class="offending"><span class="linenum">29</span> <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -375,7 +367,11 @@
<span class="failed_spec_name">fails with a backtrace that has no file</span>
<div class="failure" id="failure_3">
<div class="message"><pre>foo</pre></div>
- <div class="backtrace"><pre>(erb):1</pre></div>
+ <div class="backtrace"><pre>(erb):1:in `result'
+org/jruby/RubyKernel.java:1088:in `eval'
+./spec/rspec/core/resources/formatter_specs.rb:41:in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
<pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
</div>
</dd>
View
36 spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html
@@ -312,18 +312,14 @@
<span class="failed_spec_name">fails</span>
<div class="failure" id="failure_1">
<div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
- <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=18">./spec/rspec/core/resources/formatter_specs.rb:18</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> </pre></div>
- <pre class="ruby"><code><span class="linenum">24</span> <span class="keyword">rescue</span> <span class="constant">Exception</span>
-<span class="linenum">25</span> <span class="keyword">end</span>
-<span class="offending"><span class="linenum">26</span> <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">27</span> <span class="keyword">end</span>
-<span class="linenum">28</span> <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=18">./spec/rspec/core/resources/formatter_specs.rb:18</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
+ <pre class="ruby"><code><span class="linenum">29</span> <span class="ident">teardown_mocks_for_rspec</span>
+<span class="linenum">30</span> <span class="keyword">end</span>
+<span class="offending"><span class="linenum">31</span> <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">32</span> <span class="keyword">end</span>
+<span class="linenum">33</span> <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
</div>
</dd>
</dl>
@@ -350,13 +346,9 @@
(compared using ==)
</pre></div>
- <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=33">./spec/rspec/core/resources/formatter_specs.rb:33</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a>
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> </pre></div>
+ <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=33">./spec/rspec/core/resources/formatter_specs.rb:33</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
<pre class="ruby"><code><span class="linenum">27</span> <span class="keyword">end</span>
<span class="linenum">28</span>
<span class="offending"><span class="linenum">29</span> <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -375,7 +367,11 @@
<span class="failed_spec_name">fails with a backtrace that has no file</span>
<div class="failure" id="failure_3">
<div class="message"><pre>foo</pre></div>
- <div class="backtrace"><pre>(erb):1</pre></div>
+ <div class="backtrace"><pre>(erb):1:in `result'
+org/jruby/RubyKernel.java:1088:in `eval'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=41">./spec/rspec/core/resources/formatter_specs.rb:41</a> :in `(root)'
+org/jruby/RubyKernel.java:2021:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
<pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
</div>
</dd>
View
1  spec/spec_helper.rb
@@ -19,7 +19,6 @@ def sandboxed(&block)
RSpec.instance_variable_set(:@configuration, new_config)
RSpec.instance_variable_set(:@world, new_world)
object = Object.new
- object.extend(RSpec::Core::ObjectExtensions)
object.extend(RSpec::Core::SharedExampleGroup)
(class << RSpec::Core::ExampleGroup; self; end).class_eval do

No commit comments for this range

Something went wrong with that request. Please try again.