Skip to content
This repository
  • 18 commits
  • 17 files changed
  • 0 comments
  • 5 contributors
May 22, 2011
Robert Speicher Fix indentation warnings; Closes #352 aadc7b6
May 23, 2011
David Chelimsky dev: remove unnecessary monkey patch of Cucumber 7e34411
David Chelimsky ci: bundle exec rake (to ensure compatibility w/ downstream deps) b13d0f1
May 24, 2011
David Chelimsky Merge in changes from 2-6-maintenance branch
- no functional changes, just dev dependencies, configs, and changelog
c3d9f1b
Yann Lugrin Allow tag exclusion filtering when using drb b6a71b7
May 25, 2011
David Chelimsky ci: run against rbx and jruby c57f529
Justin Ko Merge pull request #384 from tsigo/master
Fix indentation warnings; Closes #352
3cab6c2
Justin Ko Merge pull request #387 from yannlugrin/drb_with_exclusion_tags
Allow tag exclusion filtering when using drb
4ef0c29
May 26, 2011
Elliot Winkler Fix --example option so that it is not double-escaped when running te…
…sts over DRb
28e1393
Justin Ko changelog 17bb5a3
Justin Ko 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
Justin Ko slight refactor dd29b29
Justin Ko changelog 3db6c4c
May 27, 2011
David Chelimsky process the name instead of using TYPE constants 4a5aa01
Jun 01, 2011
David Chelimsky add some docs and move some things around 3e98111
Jun 04, 2011
David Chelimsky use cyan for comments (instead of grey, which is not an ansi standard)
- Fixes #393
0e746a8
Jun 06, 2011
David Chelimsky move Changelog to project dir and copy it to features when deploying …
…relish docs
74aa307
David Chelimsky bump to 2.6.4 682f9a1
4  .travis.yml
... ...
@@ -1,7 +1,9 @@
1  
-script: "rake"
  1
+script: "bundle exec rake"
2 2
 rvm:
3 3
   - 1.8.6
4 4
   - 1.8.7
5 5
   - 1.9.1
6 6
   - 1.9.2
7 7
   - ree
  8
+  - rbx
  9
+  - jruby
17  features/Changelog.md → Changelog.md
Source Rendered
... ...
@@ -1,15 +1,22 @@
1  
-### 2.6.3 / not released
  1
+### 2.6.4 / 2011-06-06
2 2
 
3  
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...master)
  3
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.3...v2.6.4)
4 4
 
5  
-* Minor output enhancment
6  
-  * Add dump of shell commands to re-run failed examples
  5
+* Bug fixes
  6
+  * Support exclusion filters in DRb. (Yann Lugrin)
  7
+  * Fix --example escaping when run over DRb. (Elliot Winkler)
  8
+  * Use standard ANSI codes for color formatting so colors work in a wider set
  9
+    of color schemes.
  10
+
  11
+### 2.6.3 / 2011-05-24
  12
+
  13
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.2...v2.6.3)
7 14
 
8 15
 * Bug fixes
9 16
   * Explicitly convert exit code to integer, avoiding TypeError when return
10 17
     value of run is IO object proxied by `DRb::DRbObject` (Julian Scheid)
11 18
   * Clarify behavior of `--example` command line option
12  
-
  19
+  * Build using a rubygems-1.6.2 to avoid downstream yaml parsing error
13 20
 
14 21
 ### 2.6.2 / 2011-05-21
15 22
 
2  Gemfile
@@ -11,7 +11,7 @@ source "http://rubygems.org"
11 11
 end
12 12
 
13 13
 ### dev dependencies
14  
-gem "rake", "~> 0.8"
  14
+gem "rake", "~> 0.9"
15 15
 gem "cucumber", "~> 0.10.2"
16 16
 gem "aruba", "~> 0.3.6"
17 17
 gem "rcov", "0.9.9", :platforms => :mri
17  Rakefile
@@ -23,21 +23,9 @@ require "rake/rdoctask"
23 23
 require "rspec/core/rake_task"
24 24
 require "rspec/core/version"
25 25
 
26  
-cucumber_loaded = false
27  
-
28 26
 begin
29 27
   require "cucumber/rake/task"
30  
-
31 28
   Cucumber::Rake::Task.new(:cucumber)
32  
-
33  
-  class Cucumber::Rake::Task::ForkedCucumberRunner
34  
-    # When cucumber shells out, we still need it to run in the context of our
35  
-    # bundle.
36  
-    def run
37  
-      sh "bundle exec #{RUBY} " + args.join(" ")
38  
-    end
39  
-  end
40  
-  cucumber_loaded = true
41 29
 rescue LoadError => e
42 30
   puts "unable to load cucumber, some tasks unavailable"
43 31
   task :cucumber do
@@ -52,7 +40,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
52 40
   t.verbose = false
53 41
 end
54 42
 
55  
-
56 43
 namespace :rcov do
57 44
   task :cleanup do
58 45
     rm_rf 'coverage.data'
@@ -64,7 +51,7 @@ namespace :rcov do
64 51
     t.rcov_opts << %[--no-html --aggregate coverage.data]
65 52
   end
66 53
 
67  
-  if cucumber_loaded
  54
+  if defined?(Cucumber)
68 55
     Cucumber::Rake::Task.new :cucumber do |t|
69 56
       t.cucumber_opts = %w{--format progress}
70 57
       t.rcov = true
@@ -92,7 +79,9 @@ end
92 79
 desc "Push docs/cukes to relishapp using the relish-client-gem"
93 80
 task :relish, :version do |t, args|
94 81
   raise "rake relish[VERSION]" unless args[:version]
  82
+  sh "cp Changelog.md features/"
95 83
   sh "relish push rspec/rspec-core:#{args[:version]}"
  84
+  sh "rm features/Changelog.md"
96 85
 end
97 86
 
98 87
 Rake::RDocTask.new do |rdoc|
6  lib/rspec/core.rb
... ...
@@ -1,3 +1,4 @@
  1
+require 'rspec/core/dsl'
1 2
 require 'rspec/core/extensions'
2 3
 require 'rspec/core/load_path'
3 4
 require 'rspec/core/deprecation'
@@ -39,14 +40,17 @@ def self.install_directory
39 40
     end
40 41
   end
41 42
 
  43
+  # Used internally to determine what to do when a SIGINT is received
42 44
   def self.wants_to_quit
43 45
     world.wants_to_quit
44 46
   end
45 47
 
  48
+  # Used internally to determine what to do when a SIGINT is received
46 49
   def self.wants_to_quit=(maybe)
47 50
     world.wants_to_quit=(maybe)
48 51
   end
49 52
 
  53
+  # Internal container for global non-configuration data
50 54
   def self.world
51 55
     @world ||= RSpec::Core::World.new
52 56
   end
@@ -58,6 +62,7 @@ def self.reset
58 62
     configuration.reset
59 63
   end
60 64
 
  65
+  # Returns the global configuration object
61 66
   def self.configuration
62 67
     @configuration ||= RSpec::Core::Configuration.new
63 68
   end
@@ -74,6 +79,7 @@ def self.configure
74 79
     yield configuration if block_given?
75 80
   end
76 81
 
  82
+  # Used internally to clear remaining groups when fail_fast is set
77 83
   def self.clear_remaining_example_groups
78 84
     world.example_groups.clear
79 85
   end
21  lib/rspec/core/configuration_options.rb
@@ -12,15 +12,15 @@ def configure(config)
12 12
         keys = options.keys
13 13
         keys.unshift(:requires) if keys.delete(:requires)
14 14
         keys.unshift(:libs)     if keys.delete(:libs)
15  
-        
  15
+
16 16
         formatters = options[:formatters] if keys.delete(:formatters)
17  
-        
  17
+
18 18
         config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
19  
-        
  19
+
20 20
         keys.each do |key|
21 21
           config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
22 22
         end
23  
-        
  23
+
24 24
         formatters.each {|pair| config.add_formatter(*pair) } if formatters
25 25
       end
26 26
 
@@ -33,12 +33,23 @@ def drb_argv
33 33
         argv << "--fail-fast"    if options[:fail_fast]
34 34
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
35 35
         argv << "--options"      << options[:custom_options_file]     if options[:custom_options_file]
36  
-        argv << "--example"      << options[:full_description].source if options[:full_description]
  36
+        if options[:full_description]
  37
+          # The argument to --example is regexp-escaped before being stuffed
  38
+          # into a regexp when received for the first time (see OptionParser).
  39
+          # Hence, merely grabbing the source of this regexp will retain the
  40
+          # backslashes, so we must remove them.
  41
+          argv << "--example" << options[:full_description].source.delete('\\')
  42
+        end
37 43
         if options[:filter]
38 44
           options[:filter].each_pair do |k, v|
39 45
             argv << "--tag" << k.to_s
40 46
           end
41 47
         end
  48
+        if options[:exclusion_filter]
  49
+          options[:exclusion_filter].each_pair do |k, v|
  50
+            argv << "--tag" << "~#{k.to_s}"
  51
+          end
  52
+        end
42 53
         if options[:formatters]
43 54
           options[:formatters].each do |pair|
44 55
             argv << "--format" << pair[0]
6  lib/rspec/core/extensions/object.rb → lib/rspec/core/dsl.rb
... ...
@@ -1,6 +1,6 @@
1 1
 module RSpec
2 2
   module Core
3  
-    module ObjectExtensions
  3
+    module DSL
4 4
       def describe(*args, &example_group_block)
5 5
         RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
6 6
       end
@@ -8,6 +8,4 @@ def describe(*args, &example_group_block)
8 8
   end
9 9
 end
10 10
 
11  
-class Object
12  
-  include RSpec::Core::ObjectExtensions
13  
-end
  11
+include RSpec::Core::DSL
2  lib/rspec/core/expecting/with_rspec.rb
@@ -3,9 +3,7 @@
3 3
 module RSpec
4 4
   module Core
5 5
     module ExpectationFrameworkAdapter
6  
-
7 6
       include RSpec::Matchers
8  
-
9 7
     end
10 8
   end
11 9
 end
1  lib/rspec/core/extensions.rb
... ...
@@ -1,4 +1,3 @@
1  
-require 'rspec/core/extensions/object'
2 1
 require 'rspec/core/extensions/kernel'
3 2
 require 'rspec/core/extensions/instance_eval_with_args'
4 3
 require 'rspec/core/extensions/module_eval_with_args'
34  lib/rspec/core/formatters/base_text_formatter.rb
@@ -49,7 +49,7 @@ def dump_commands_to_rerun_failed_examples
49 49
           output.puts
50 50
 
51 51
           failed_examples.each do |example|
52  
-            output.puts(red("rspec #{BaseFormatter::relative_path(example.location)}") + " " + grey("# #{example.full_description}"))
  52
+            output.puts(red("rspec #{BaseFormatter::relative_path(example.location)}") + " " + cyan("# #{example.full_description}"))
53 53
           end
54 54
         end
55 55
 
@@ -58,7 +58,7 @@ def dump_profile
58 58
           output.puts "\nTop #{sorted_examples.size} slowest examples:\n"
59 59
           sorted_examples.each do |example|
60 60
             output.puts "  #{example.full_description}"
61  
-            output.puts grey("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
  61
+            output.puts cyan("    #{red(format_seconds(example.execution_result[:run_time]))} #{red("seconds")} #{format_caller(example.location)}")
62 62
           end
63 63
         end
64 64
 
@@ -75,8 +75,8 @@ def dump_pending
75 75
             output.puts "Pending:"
76 76
             pending_examples.each do |pending_example|
77 77
               output.puts yellow("  #{pending_example.full_description}")
78  
-              output.puts grey("    # #{pending_example.execution_result[:pending_message]}")
79  
-              output.puts grey("    # #{format_caller(pending_example.location)}")
  78
+              output.puts cyan("    # #{pending_example.execution_result[:pending_message]}")
  79
+              output.puts cyan("    # #{format_caller(pending_example.location)}")
80 80
             end
81 81
           end
82 82
         end
@@ -95,20 +95,12 @@ def bold(text)
95 95
           color(text, "\e[1m")
96 96
         end
97 97
 
98  
-        def white(text)
99  
-          color(text, "\e[37m")
100  
-        end
101  
-
102  
-        def green(text)
103  
-          color(text, "\e[32m")
104  
-        end
105  
-
106 98
         def red(text)
107 99
           color(text, "\e[31m")
108 100
         end
109 101
 
110  
-        def magenta(text)
111  
-          color(text, "\e[35m")
  102
+        def green(text)
  103
+          color(text, "\e[32m")
112 104
         end
113 105
 
114 106
         def yellow(text)
@@ -119,8 +111,16 @@ def blue(text)
119 111
           color(text, "\e[34m")
120 112
         end
121 113
 
122  
-        def grey(text)
123  
-          color(text, "\e[90m")
  114
+        def magenta(text)
  115
+          color(text, "\e[35m")
  116
+        end
  117
+
  118
+        def cyan(text)
  119
+          color(text, "\e[36m")
  120
+        end
  121
+
  122
+        def white(text)
  123
+          color(text, "\e[37m")
124 124
         end
125 125
 
126 126
         def short_padding
@@ -143,7 +143,7 @@ def format_caller(caller_info)
143 143
 
144 144
         def dump_backtrace(example)
145 145
           format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
146  
-            output.puts grey("#{long_padding}# #{backtrace_info}")
  146
+            output.puts cyan("#{long_padding}# #{backtrace_info}")
147 147
           end
148 148
         end
149 149
 
9  lib/rspec/core/hooks.rb
@@ -8,7 +8,7 @@ class Hook
8 8
 
9 9
         def initialize(options, &block)
10 10
           @options = options
11  
-          raise "no block given for #{self.class::TYPE} hook" unless block
  11
+          raise "no block given for #{display_name}" unless block
12 12
           @block = block
13 13
         end
14 14
 
@@ -23,10 +23,13 @@ def to_proc
23 23
         def call
24 24
           @block.call
25 25
         end
  26
+
  27
+        def display_name
  28
+          self.class.name.split('::').last.gsub('Hook','').downcase << " hook"
  29
+        end
26 30
       end
27 31
 
28 32
       class BeforeHook < Hook
29  
-        TYPE = 'before'
30 33
         def run_in(example_group_instance)
31 34
           if example_group_instance
32 35
             example_group_instance.instance_eval(&self)
@@ -37,7 +40,6 @@ def run_in(example_group_instance)
37 40
       end
38 41
 
39 42
       class AfterHook < Hook
40  
-        TYPE = 'after'
41 43
         def run_in(example_group_instance)
42 44
           if example_group_instance
43 45
             example_group_instance.instance_eval_with_rescue(&self)
@@ -48,7 +50,6 @@ def run_in(example_group_instance)
48 50
       end
49 51
 
50 52
       class AroundHook < Hook
51  
-        TYPE = 'around'
52 53
         def call(wrapped_example)
53 54
           @block.call(wrapped_example)
54 55
         end
2  lib/rspec/core/metadata_hash_builder.rb
@@ -87,7 +87,7 @@ def symbol_metadata_warning(symbols)
87 87
 
88 88
 NOTICE
89 89
           end
90  
-        end
91 90
       end
  91
+    end
92 92
   end
93 93
 end
2  lib/rspec/core/version.rb
... ...
@@ -1,7 +1,7 @@
1 1
 module RSpec # :nodoc:
2 2
   module Core # :nodoc:
3 3
     module Version # :nodoc:
4  
-      STRING = '2.6.3.beta1'
  4
+      STRING = '2.6.4'
5 5
     end
6 6
   end
7 7
 end
29  spec/rspec/core/configuration_options_spec.rb
@@ -14,7 +14,7 @@ def parse_options(*args)
14 14
     config_options_object(*args).options
15 15
   end
16 16
 
17  
-  it "warns when HOME env var is not set" do
  17
+  it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
18 18
     begin
19 19
       orig_home = ENV.delete("HOME")
20 20
       coo = RSpec::Core::ConfigurationOptions.new([])
@@ -41,7 +41,7 @@ def parse_options(*args)
41 41
       config.should_receive(:add_formatter).ordered
42 42
       opts.configure(config)
43 43
     end
44  
-    
  44
+
45 45
     it "merges the :exclusion_filter option with the default exclusion_filter" do
46 46
       opts = config_options_object(*%w[--tag ~slow])
47 47
       config = RSpec::Core::Configuration.new
@@ -223,17 +223,38 @@ def parse_options(*args)
223 223
       config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
224 224
     end
225 225
 
  226
+    context "with --example" do
  227
+      it "includes --example" do
  228
+        config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
  229
+      end
  230
+      
  231
+      it "unescapes characters which were escaped upon storing --example originally" do
  232
+        config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
  233
+      end
  234
+    end
  235
+
226 236
     context "with tags" do
227  
-      it "includes the tags" do
  237
+      it "includes the inclusion tags" do
228 238
         coo = config_options_object("--tag", "tag")
229 239
         coo.drb_argv.should eq(["--tag", "tag"])
230 240
       end
231 241
 
232  
-      it "leaves tags intact" do
  242
+      it "leaves inclusion tags intact" do
233 243
         coo = config_options_object("--tag", "tag")
234 244
         coo.drb_argv
235 245
         coo.options[:filter].should eq( {:tag=>true} )
236 246
       end
  247
+
  248
+      it "includes the exclusion tags" do
  249
+        coo = config_options_object("--tag", "~tag")
  250
+        coo.drb_argv.should eq(["--tag", "~tag"])
  251
+      end
  252
+
  253
+      it "leaves exclusion tags intact" do
  254
+        coo = config_options_object("--tag", "~tag")
  255
+        coo.drb_argv
  256
+        coo.options[:exclusion_filter].should eq( {:tag=>true} )
  257
+      end
237 258
     end
238 259
 
239 260
     context "with formatters" do
36  spec/rspec/core/formatters/html_formatted-1.8.7-jruby.html
@@ -312,18 +312,14 @@
312 312
       <span class="failed_spec_name">fails</span>
313 313
       <div class="failure" id="failure_1">
314 314
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
315  
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18
316  
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
317  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
318  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
319  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
320  
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
321  
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
322  
-    <pre class="ruby"><code><span class="linenum">24</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span>
323  
-<span class="linenum">25</span>          <span class="keyword">end</span>
324  
-<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>
325  
-<span class="linenum">27</span>        <span class="keyword">end</span>
326  
-<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>
  315
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `(root)'
  316
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  317
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
  318
+    <pre class="ruby"><code><span class="linenum">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
  319
+<span class="linenum">30</span>          <span class="keyword">end</span>
  320
+<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>
  321
+<span class="linenum">32</span>        <span class="keyword">end</span>
  322
+<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>
327 323
       </div>
328 324
     </dd>
329 325
   </dl>
@@ -350,13 +346,9 @@
350 346
 
351 347
 (compared using ==)
352 348
 </pre></div>
353  
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33
354  
-./spec/rspec/core/formatters/html_formatter_spec.rb:24
355  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
356  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `open'
357  
-./spec/rspec/core/formatters/html_formatter_spec.rb:46
358  
-./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `chdir'
359  
-./spec/rspec/core/formatters/html_formatter_spec.rb:45</pre></div>
  349
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `(root)'
  350
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  351
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
360 352
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
361 353
 <span class="linenum">28</span>
362 354
 <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 @@
375 367
       <span class="failed_spec_name">fails with a backtrace that has no file</span>
376 368
       <div class="failure" id="failure_3">
377 369
         <div class="message"><pre>foo</pre></div>
378  
-        <div class="backtrace"><pre>(erb):1</pre></div>
  370
+        <div class="backtrace"><pre>(erb):1:in `result'
  371
+org/jruby/RubyKernel.java:1088:in `eval'
  372
+./spec/rspec/core/resources/formatter_specs.rb:41:in `(root)'
  373
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  374
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
379 375
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
380 376
       </div>
381 377
     </dd>
36  spec/rspec/core/formatters/text_mate_formatted-1.8.7-jruby.html
@@ -312,18 +312,14 @@
312 312
       <span class="failed_spec_name">fails</span>
313 313
       <div class="failure" id="failure_1">
314 314
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
315  
-        <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> 
316  
-<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> 
317  
-<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> 
318  
-<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'
319  
-<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> 
320  
-<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'
321  
-<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>
322  
-    <pre class="ruby"><code><span class="linenum">24</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span>
323  
-<span class="linenum">25</span>          <span class="keyword">end</span>
324  
-<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>
325  
-<span class="linenum">27</span>        <span class="keyword">end</span>
326  
-<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>
  315
+        <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)'
  316
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  317
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
  318
+    <pre class="ruby"><code><span class="linenum">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
  319
+<span class="linenum">30</span>          <span class="keyword">end</span>
  320
+<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>
  321
+<span class="linenum">32</span>        <span class="keyword">end</span>
  322
+<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>
327 323
       </div>
328 324
     </dd>
329 325
   </dl>
@@ -350,13 +346,9 @@
350 346
 
351 347
 (compared using ==)
352 348
 </pre></div>
353  
-        <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> 
354  
-<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> 
355  
-<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> 
356  
-<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'
357  
-<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> 
358  
-<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'
359  
-<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>
  349
+        <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)'
  350
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  351
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
360 352
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
361 353
 <span class="linenum">28</span>
362 354
 <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 @@
375 367
       <span class="failed_spec_name">fails with a backtrace that has no file</span>
376 368
       <div class="failure" id="failure_3">
377 369
         <div class="message"><pre>foo</pre></div>
378  
-        <div class="backtrace"><pre>(erb):1</pre></div>
  370
+        <div class="backtrace"><pre>(erb):1:in `result'
  371
+org/jruby/RubyKernel.java:1088:in `eval'
  372
+<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)'
  373
+org/jruby/RubyKernel.java:2021:in `instance_eval'
  374
+org/jruby/RubyArray.java:2336:in `collect'</pre></div>
379 375
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
380 376
       </div>
381 377
     </dd>
1  spec/spec_helper.rb
@@ -19,7 +19,6 @@ def sandboxed(&block)
19 19
     RSpec.instance_variable_set(:@configuration, new_config)
20 20
     RSpec.instance_variable_set(:@world, new_world)
21 21
     object = Object.new
22  
-    object.extend(RSpec::Core::ObjectExtensions)
23 22
     object.extend(RSpec::Core::SharedExampleGroup)
24 23
 
25 24
     (class << RSpec::Core::ExampleGroup; self; end).class_eval do

No commit comments for this range

Something went wrong with that request. Please try again.