rspec-core 2.99.0.beta1 → 2.99.0.beta2

data/spec/rspec/core/example_group_spec.rb

@@ -693,30 +693,52 @@ module RSpec::Core
       end
     end
 
-    %w[pending xit xspecify xexample].each do |method_name|
-      describe "::#{method_name}" do
-        before do
-          @group = ExampleGroup.describe
-          @group.send(method_name, "is pending") { }
-        end
+    %w[pending skip].each do |method_name|
+      describe ".#{method_name}" do
+        let(:group) { ExampleGroup.describe.tap {|x|
+          x.send(method_name, "is pending") { }
+        }}
 
         it "generates a pending example" do
-          @group.run
-          expect(@group.examples.first).to be_pending
+          group.run
+          expect(group.examples.first).to be_pending
+        end
+
+        it "sets the pending message" do
+          group.run
+          expect(group.examples.first.metadata[:execution_result][:pending_message]).to eq(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
+      end
+    end
 
-        it "sets the pending message", :if => method_name == 'pending' do
-          @group.run
-          expect(@group.examples.first.metadata[:execution_result][:pending_message]).to eq(RSpec::Core::Pending::NO_REASON_GIVEN)
+    %w[xit xspecify xexample].each do |method_name|
+      describe ".#{method_name}" do
+        let(:group) { ExampleGroup.describe.tap {|x|
+          x.send(method_name, "is pending") { }
+        }}
+
+        it "generates a pending example" do
+          group.run
+          expect(group.examples.first).to be_pending
         end
 
-        it "sets the pending message", :unless => method_name == 'pending' do
-          @group.run
-          expect(@group.examples.first.metadata[:execution_result][:pending_message]).to eq("Temporarily disabled with #{method_name}")
+        it "sets the pending message" do
+          group.run
+          expect(group.examples.first.metadata[:execution_result][:pending_message]).to eq("Temporarily disabled with #{method_name}")
         end
       end
     end
 
+    describe '::pending' do
+      it 'shows upgrade warning' do
+        expect_warn_deprecation_with_call_site(
+          "example_group_spec.rb", __LINE__ + 3
+        )
+        group = ExampleGroup.describe
+        group.send(:pending, "is pending") { }
+      end
+    end
+
     describe "adding examples" do
 
       it "allows adding an example using 'it'" do

data/spec/rspec/core/filter_manager_spec.rb

@@ -165,7 +165,7 @@ module RSpec::Core
     describe "#inclusions#description" do
       it 'cleans up the description' do
         project_dir = File.expand_path('.')
-        expect(lambda { }.inspect).to include(project_dir) unless defined?(JRUBY_VERSION) && JRUBY_VERSION == '1.7.4'
+        expect(lambda { }.inspect).to include(project_dir) unless defined?(JRUBY_VERSION) && JRUBY_VERSION =~ /\A1\.7/
         expect(lambda { }.inspect).to include(' (lambda)') if RUBY_VERSION > '1.9'
         expect(lambda { }.inspect).to include('0x')
 
@@ -181,7 +181,7 @@ module RSpec::Core
     describe "#exclusions#description" do
       it 'cleans up the description' do
         project_dir = File.expand_path('.')
-        expect(lambda { }.inspect).to include(project_dir) unless defined?(JRUBY_VERSION) && JRUBY_VERSION == '1.7.4'
+        expect(lambda { }.inspect).to include(project_dir) unless defined?(JRUBY_VERSION) && JRUBY_VERSION =~ /\A1\.7/
         expect(lambda { }.inspect).to include(' (lambda)') if RUBY_VERSION > '1.9'
         expect(lambda { }.inspect).to include('0x')
 

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -202,7 +202,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
     end
 
     context "with show_failures_in_pending_blocks setting enabled" do
-      before { RSpec.configuration.stub(:show_failures_in_pending_blocks?) { true } }
+      before { RSpec.configuration.instance_variable_set(:@show_failures_in_pending_blocks, true) }
 
       it "preserves formatting" do
         group.example("example name") { pending { expect("this").to eq("that") } }

data/spec/rspec/core/formatters/deprecation_formatter_spec.rb

@@ -108,6 +108,27 @@ module RSpec::Core::Formatters
         end
       end
 
+      context "with an Error deprecation_stream" do
+        let(:deprecation_stream) { DeprecationFormatter::RaiseErrorStream.new }
+
+        it 'prints a summary of the number of deprecations found' do
+          expect { formatter.deprecation(:deprecated => 'foo') }.to raise_error(RSpec::Core::DeprecationError)
+
+          formatter.deprecation_summary
+
+          expect(summary_stream.string).to eq("\n1 deprecation found.\n")
+        end
+
+        it 'pluralizes the count when it is greater than 1' do
+          expect { formatter.deprecation(:deprecated => 'foo') }.to raise_error(RSpec::Core::DeprecationError)
+          expect { formatter.deprecation(:deprecated => 'bar') }.to raise_error(RSpec::Core::DeprecationError)
+
+          formatter.deprecation_summary
+
+          expect(summary_stream.string).to eq("\n2 deprecations found.\n")
+        end
+      end
+
       context "with an IO deprecation_stream" do
         let(:deprecation_stream) { StringIO.new }
 
@@ -148,6 +169,31 @@ module RSpec::Core::Formatters
           expect(deprecation_stream.string).to eq expected.chomp
         end
 
+        it "limits deprecations warnings by optional type" do
+          5.times {|i|
+            formatter.deprecation(
+              :deprecated => "i_am_deprecated #{i}",
+              :call_site => "foo.rb:#{i + 1}",
+              :type => 'i_am_deprecated'
+            )
+          }
+          formatter.deprecation_summary
+
+          expected = <<-EOS.gsub(/^\s+\|/, '')
+            |
+            |Deprecation Warnings:
+            |
+            |i_am_deprecated 0 is deprecated. Called from foo.rb:1.
+            |i_am_deprecated 1 is deprecated. Called from foo.rb:2.
+            |i_am_deprecated 2 is deprecated. Called from foo.rb:3.
+            |Too many uses of deprecated 'i_am_deprecated'. Set config.deprecation_stream to a File for full output.
+            |
+            |#{DeprecationFormatter::RAISE_ERROR_CONFIG_NOTICE}
+          EOS
+          expect(deprecation_stream.string).to eq expected.chomp
+        end
+
+
         it "limits :message deprecation warnings with different callsites after 3 calls" do
           5.times do |n|
             message = "This is a long string with some callsite info: /path/#{n}/to/some/file.rb:2#{n}3.  And some more stuff can come after."

data/spec/rspec/core/formatters/{html_formatted-1.8.7-jruby.html → html_formatted.html}

@@ -1,10 +1,9 @@
-<!DOCTYPE html>
-<html lang='en'>
+<html lang="en">
 <head>
   <title>RSpec results</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Expires" content="-1" />
-  <meta http-equiv="Pragma" content="no-cache" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Expires" content="-1">
+  <meta http-equiv="Pragma" content="no-cache">
   <style type="text/css">
   body {
     margin: 0;
@@ -266,14 +265,14 @@ a {
   </div>
 
   <div id="display-filters">
-    <input id="passed_checkbox"  name="passed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="1" /> <label for="passed_checkbox">Passed</label>
-    <input id="failed_checkbox"  name="failed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="2" /> <label for="failed_checkbox">Failed</label>
-    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked="checked" onchange="apply_filters()" value="3" /> <label for="pending_checkbox">Pending</label>
+    <input id="passed_checkbox" name="passed_checkbox" type="checkbox" checked onchange="apply_filters()" value="1"> <label for="passed_checkbox">Passed</label>
+    <input id="failed_checkbox" name="failed_checkbox" type="checkbox" checked onchange="apply_filters()" value="2"> <label for="failed_checkbox">Failed</label>
+    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked onchange="apply_filters()" value="3"> <label for="pending_checkbox">Pending</label>
   </div>
 
   <div id="summary">
-    <p id="totals">&#160;</p>
-    <p id="duration">&#160;</p>
+    <p id="totals"> </p>
+    <p id="duration"> </p>
   </div>
 </div>
 
@@ -316,12 +315,9 @@ a {
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::Pending::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `(root)'
-./spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
-    <pre class="ruby"><code><span class="linenum">16</span>  <span class="ident">context</span> <span class="punct">&quot;</span><span class="string">with content that would pass</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">17</span>    <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18</pre></div>
+    <pre class="ruby"><code><span class="linenum">16</span>  <span class="ident">context</span> <span class="punct">"</span><span class="string">with content that would pass</span><span class="punct">"</span> <span class="keyword">do</span>
+<span class="linenum">17</span>    <span class="ident">it</span> <span class="punct">"</span><span class="string">fails</span><span class="punct">"</span> <span class="keyword">do</span>
 <span class="offending"><span class="linenum">18</span>      <span class="ident">pending</span> <span class="keyword">do</span></span>
 <span class="linenum">19</span>        <span class="ident">expect</span><span class="punct">(</span><span class="number">1</span><span class="punct">).</span><span class="ident">to</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">1</span><span class="punct">)</span>
 <span class="linenum">20</span>      <span class="keyword">end</span></code></pre>
@@ -333,7 +329,9 @@ a {
   <dl style="margin-left: 0px;">
   <dt id="example_group_5" class="passed">passing spec</dt>
     <script type="text/javascript">moveProgressBar('57.1');</script>
-    <dd class="example passed"><span class="passed_spec_name">passes</span><span class='duration'>n.nnnns</span></dd>
+    <dd class="example passed">
+<span class="passed_spec_name">passes</span><span class="duration">n.nnnns</span>
+</dd>
   </dl>
 </div>
 <div id="div_group_6" class="example_group passed">
@@ -352,12 +350,9 @@ expected: 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `(root)'
-./spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
-    <pre class="ruby"><code><span class="linenum">31</span><span class="ident">describe</span> <span class="punct">&quot;</span><span class="string">failing spec</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span><span class="ident">describe</span> <span class="punct">"</span><span class="string">failing spec</span><span class="punct">"</span> <span class="keyword">do</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">"</span><span class="string">fails</span><span class="punct">"</span> <span class="keyword">do</span>
 <span class="offending"><span class="linenum">33</span>    <span class="ident">expect</span><span class="punct">(</span><span class="number">1</span><span class="punct">).</span><span class="ident">to</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">2</span><span class="punct">)</span></span>
 <span class="linenum">34</span>  <span class="keyword">end</span>
 <span class="linenum">35</span><span class="keyword">end</span></code></pre>
@@ -376,11 +371,7 @@ expected: 2
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>foo</pre></div>
-        <div class="backtrace"><pre>(erb):1:in `result'
-./spec/rspec/core/resources/formatter_specs.rb:41:in `(root)'
-./spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-./spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
+        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:41</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>
@@ -390,7 +381,7 @@ expected: 2
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_4">
         <div class="message"><pre>Exception</pre></div>
-        <div class="backtrace"><pre>/foo.html.erb:1:in `&lt;main&gt;': foo (RuntimeError)</pre></div>
+        <div class="backtrace"><pre></pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for /foo.html.erb</span></code></pre>
       </div>
     </dd>
@@ -401,4 +392,7 @@ expected: 2
 </div>
 </div>
 </body>
-</html>
+</html><html><p>
+
+2 deprecation warnings total
+</p></html>

data/spec/rspec/core/formatters/html_formatter_spec.rb

@@ -7,19 +7,10 @@ module RSpec
   module Core
     module Formatters
       describe HtmlFormatter, :if => RUBY_VERSION =~ /^(1.8.7|1.9.2|1.9.3|2.0.0)$/ do
-        let(:suffix) {
-          if ::RUBY_PLATFORM == 'java'
-            "-jruby"
-          elsif defined?(Rubinius)
-            "-rbx"
-          else
-            ""
-          end
-        }
 
         let(:root) { File.expand_path("#{File.dirname(__FILE__)}/../../../..") }
         let(:expected_file) do
-          "#{File.dirname(__FILE__)}/html_formatted-#{::RUBY_VERSION}#{suffix}.html"
+          "#{File.dirname(__FILE__)}/html_formatted.html"
         end
 
         let(:generated_html) do
@@ -35,7 +26,20 @@ module RSpec
           command_line = RSpec::Core::CommandLine.new(options)
           command_line.instance_variable_get("@configuration").backtrace_cleaner.inclusion_patterns = []
           command_line.run(err, out)
-          out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
+          html = out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
+
+          actual_doc = Nokogiri::HTML(html)
+          actual_doc.css("div.backtrace pre").each do |elem|
+            # This is to minimize churn on backtrace lines that we do not
+            # assert on anyway.
+            backtrace = elem.inner_html.lines.
+              select {|e| e =~ /formatter_specs\.rb/ }.
+              map {|x| x.chomp.split(":")[0..1].join(':') }.
+              join("\n")
+
+            elem.inner_html = backtrace
+          end
+          actual_doc.inner_html
         end
 
         let(:expected_html) do
@@ -68,7 +72,18 @@ module RSpec
             select  {|e| e =~ /formatter_specs\.rb/}
         end
 
-        describe 'produced HTML' do
+        describe 'produced HTML', :if => RUBY_VERSION <= '2.0.0' do
+          # Rubies before 2 are a wild west of different outputs, and it's not
+          # worth the effort to maintain accurate fixtures for all of them.
+          # Since we are verifying fixtures on other rubies, if this code at
+          # least runs we can be reasonably confident the output is right since
+          # behaviour variances that we care about across versions is neglible.
+          it 'is present' do
+            expect(generated_html).to be
+          end
+        end
+
+        describe 'produced HTML', :slow, :if => RUBY_VERSION >= '2.0.0' do
           def build_and_verify_formatter_output
             Dir.chdir(root) do
               actual_doc = Nokogiri::HTML(generated_html)
@@ -92,15 +107,15 @@ module RSpec
             end
           end
 
-          it "produces HTML identical to the one we designed manually" do
+          it "is identical to the one we designed manually" do
             build_and_verify_formatter_output
           end
 
           context 'with mathn loaded' do
             include MathnIntegrationSupport
 
-            it "produces HTML identical to the one we designed manually" do
-              with_mathn_loaded{ build_and_verify_formatter_output }
+            it "is identical to the one we designed manually", :slow do
+              with_mathn_loaded { build_and_verify_formatter_output }
             end
           end
         end

data/spec/rspec/core/formatters/{html_formatted-1.9.3-jruby.html → text_mate_formatted.html}

@@ -1,10 +1,9 @@
-<!DOCTYPE html>
-<html lang='en'>
+<html lang="en">
 <head>
   <title>RSpec results</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta http-equiv="Expires" content="-1" />
-  <meta http-equiv="Pragma" content="no-cache" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="Expires" content="-1">
+  <meta http-equiv="Pragma" content="no-cache">
   <style type="text/css">
   body {
     margin: 0;
@@ -266,14 +265,14 @@ a {
   </div>
 
   <div id="display-filters">
-    <input id="passed_checkbox"  name="passed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="1" /> <label for="passed_checkbox">Passed</label>
-    <input id="failed_checkbox"  name="failed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="2" /> <label for="failed_checkbox">Failed</label>
-    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked="checked" onchange="apply_filters()" value="3" /> <label for="pending_checkbox">Pending</label>
+    <input id="passed_checkbox" name="passed_checkbox" type="checkbox" checked onchange="apply_filters()" value="1"> <label for="passed_checkbox">Passed</label>
+    <input id="failed_checkbox" name="failed_checkbox" type="checkbox" checked onchange="apply_filters()" value="2"> <label for="failed_checkbox">Failed</label>
+    <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked onchange="apply_filters()" value="3"> <label for="pending_checkbox">Pending</label>
   </div>
 
   <div id="summary">
-    <p id="totals">&#160;</p>
-    <p id="duration">&#160;</p>
+    <p id="totals"> </p>
+    <p id="duration"> </p>
   </div>
 </div>
 
@@ -316,12 +315,9 @@ a {
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::Pending::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:18:in `(root)'
-././spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
-    <pre class="ruby"><code><span class="linenum">16</span>  <span class="ident">context</span> <span class="punct">&quot;</span><span class="string">with content that would pass</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">17</span>    <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+        <div class="backtrace"><pre>&lt;a href="txmt://open?url=file</pre></div>
+    <pre class="ruby"><code><span class="linenum">16</span>  <span class="ident">context</span> <span class="punct">"</span><span class="string">with content that would pass</span><span class="punct">"</span> <span class="keyword">do</span>
+<span class="linenum">17</span>    <span class="ident">it</span> <span class="punct">"</span><span class="string">fails</span><span class="punct">"</span> <span class="keyword">do</span>
 <span class="offending"><span class="linenum">18</span>      <span class="ident">pending</span> <span class="keyword">do</span></span>
 <span class="linenum">19</span>        <span class="ident">expect</span><span class="punct">(</span><span class="number">1</span><span class="punct">).</span><span class="ident">to</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">1</span><span class="punct">)</span>
 <span class="linenum">20</span>      <span class="keyword">end</span></code></pre>
@@ -333,7 +329,9 @@ a {
   <dl style="margin-left: 0px;">
   <dt id="example_group_5" class="passed">passing spec</dt>
     <script type="text/javascript">moveProgressBar('57.1');</script>
-    <dd class="example passed"><span class="passed_spec_name">passes</span><span class='duration'>n.nnnns</span></dd>
+    <dd class="example passed">
+<span class="passed_spec_name">passes</span><span class="duration">n.nnnns</span>
+</dd>
   </dl>
 </div>
 <div id="div_group_6" class="example_group passed">
@@ -352,12 +350,9 @@ expected: 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre>./spec/rspec/core/resources/formatter_specs.rb:33:in `(root)'
-././spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
-    <pre class="ruby"><code><span class="linenum">31</span><span class="ident">describe</span> <span class="punct">&quot;</span><span class="string">failing spec</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+        <div class="backtrace"><pre>&lt;a href="txmt://open?url=file</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span><span class="ident">describe</span> <span class="punct">"</span><span class="string">failing spec</span><span class="punct">"</span> <span class="keyword">do</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">"</span><span class="string">fails</span><span class="punct">"</span> <span class="keyword">do</span>
 <span class="offending"><span class="linenum">33</span>    <span class="ident">expect</span><span class="punct">(</span><span class="number">1</span><span class="punct">).</span><span class="ident">to</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">2</span><span class="punct">)</span></span>
 <span class="linenum">34</span>  <span class="keyword">end</span>
 <span class="linenum">35</span><span class="keyword">end</span></code></pre>
@@ -376,11 +371,7 @@ expected: 2
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>foo</pre></div>
-        <div class="backtrace"><pre>(erb):1:in `result'
-./spec/rspec/core/resources/formatter_specs.rb:41:in `(root)'
-././spec/support/sandboxed_mock_space.rb:33:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:72:in `sandboxed'
-././spec/support/sandboxed_mock_space.rb:32:in `sandboxed'</pre></div>
+        <div class="backtrace"><pre>&lt;a href="txmt://open?url=file</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>
@@ -390,7 +381,7 @@ expected: 2
       <span class="duration">n.nnnns</span>
       <div class="failure" id="failure_4">
         <div class="message"><pre>Exception</pre></div>
-        <div class="backtrace"><pre>/foo.html.erb:1:in `&lt;main&gt;': foo (RuntimeError)</pre></div>
+        <div class="backtrace"><pre></pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for /foo.html.erb</span></code></pre>
       </div>
     </dd>
@@ -401,4 +392,7 @@ expected: 2
 </div>
 </div>
 </body>
-</html>
+</html><html><p>
+
+2 deprecation warnings total
+</p></html>

data/spec/rspec/core/formatters/text_mate_formatter_spec.rb

@@ -7,19 +7,10 @@ module RSpec
   module Core
     module Formatters
       describe TextMateFormatter do
-        let(:suffix) {
-          if ::RUBY_PLATFORM == 'java'
-            "-jruby"
-          elsif defined?(Rubinius)
-            "-rbx"
-          else
-            ""
-          end
-        }
 
         let(:root) { File.expand_path("#{File.dirname(__FILE__)}/../../../..") }
         let(:expected_file) do
-          "#{File.dirname(__FILE__)}/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
+          "#{File.dirname(__FILE__)}/text_mate_formatted.html"
         end
 
         let(:generated_html) do
@@ -35,7 +26,20 @@ module RSpec
           command_line = RSpec::Core::CommandLine.new(options)
           command_line.instance_variable_get("@configuration").backtrace_cleaner.inclusion_patterns = []
           command_line.run(err, out)
-          out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
+          html = out.string.gsub(/\d+\.\d+(s| seconds)/, "n.nnnn\\1")
+
+          actual_doc = Nokogiri::HTML(html)
+          actual_doc.css("div.backtrace pre").each do |elem|
+            # This is to minimize churn on backtrace lines that we do not
+            # assert on anyway.
+            backtrace = elem.inner_html.lines.
+              select {|e| e =~ /formatter_specs\.rb/ }.
+              map {|x| x.chomp.split(":")[0..1].join(':') }.
+              join("\n")
+
+            elem.inner_html = backtrace
+          end
+          actual_doc.inner_html
         end
 
         let(:expected_html) do
@@ -61,33 +65,34 @@ module RSpec
           end
         end
 
-        it "produces HTML identical to the one we designed manually" do
-          Dir.chdir(root) do
-            actual_doc = Nokogiri::HTML(generated_html)
-            backtrace_lines = actual_doc.search("div.backtrace a")
-            actual_doc.search("div.backtrace").remove
-
-            expected_doc = Nokogiri::HTML(expected_html)
-            expected_doc.search("div.backtrace").remove
-
-            expect(actual_doc.inner_html).to eq(expected_doc.inner_html)
-
-            backtrace_lines.each do |backtrace_line|
-              expect(backtrace_line['href']).to include("txmt://open?url=")
-            end
+        describe 'produced HTML', :if => RUBY_VERSION <= '2.0.0' do
+          # Rubies before 2 are a wild west of different outputs, and it's not
+          # worth the effort to maintain accurate fixtures for all of them.
+          # Since we are verifying fixtures on other rubies, if this code at
+          # least runs we can be reasonably confident the output is right since
+          # behaviour variances that we care about across versions is neglible.
+          it 'is present' do
+            expect(generated_html).to be
           end
         end
 
-        it "has a backtrace line from the raw erb evaluation" do
-          Dir.chdir(root) do
-            actual_doc = Nokogiri::HTML(generated_html)
+        context 'produced HTML', :if => RUBY_VERSION >= '2.0.0' do
+          it "produces HTML identical to the one we designed manually" do
+            Dir.chdir(root) do
+              actual_doc = Nokogiri::HTML(generated_html)
+              backtrace_lines = actual_doc.search("div.backtrace a")
+              actual_doc.search("div.backtrace").remove
 
-            expect(actual_doc.inner_html).to include('(erb):1')
-          end
-        end
+              expected_doc = Nokogiri::HTML(expected_html)
+              expected_doc.search("div.backtrace").remove
 
-        it "has a backtrace line from a erb source file we forced to appear" do
-          expect(generated_html).to include('open?url=file:///foo.html.erb')
+              expect(actual_doc.inner_html).to eq(expected_doc.inner_html)
+
+              backtrace_lines.each do |backtrace_line|
+                expect(backtrace_line['href']).to include("txmt://open?url=")
+              end
+            end
+          end
         end
 
       end