rspec-core 2.6.4 → 2.7.0.rc1

data/spec/rspec/core/example_spec.rb

@@ -16,9 +16,24 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
+  describe "#exception" do
+    it "supplies the first exception raised, if any" do
+      example = example_group.example { raise "first" }
+      example_group.after { raise "second" }
+      example_group.run
+      example.exception.message.should eq("first")
+    end
+
+    it "returns nil if there is no exception" do
+      example = example_group.example('example') { }
+      example_group.run
+      example.exception.should be_nil
+    end
+  end
+
   describe "auto-generated example descriptions" do
     let(:generated_description) { "the generated description" }
-    let(:rspec_example) { example_group.specify { 5.should == 5 } }
+    let(:rspec_example) { example_group.specify { 5.should eq(5) } }
     before(:each) { RSpec::Matchers.stub(:generated_description => generated_description) }
 
     def expect_with(*frameworks)
@@ -71,13 +86,13 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
   describe '#described_class' do
     it "returns the class (if any) of the outermost example group" do
-      described_class.should == RSpec::Core::Example
+      described_class.should eq(RSpec::Core::Example)
     end
   end
 
   describe "accessing metadata within a running example" do
     it "has a reference to itself when running" do
-      example.description.should == "has a reference to itself when running"
+      example.description.should eq("has a reference to itself when running")
     end
 
     it "can access the example group's top level metadata as if it were its own" do
@@ -88,7 +103,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
   describe "accessing options within a running example" do
     it "can look up option values by key", :demo => :data do
-      example.options[:demo].should == :data
+      example.options[:demo].should eq(:data)
     end
   end
 
@@ -105,7 +120,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       after_run = false
       group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
-        example('example') { 1.should == 1 }
+        example('example') { 1.should eq(1) }
       end
       group.run
       after_run.should be_true, "expected after(:each) to be run"
@@ -115,7 +130,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       after_run = false
       group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
-        example('example') { 1.should == 2 }
+        example('example') { 1.should eq(2) }
       end
       group.run
       after_run.should be_true, "expected after(:each) to be run"
@@ -137,7 +152,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         group = RSpec::Core::ExampleGroup.describe do
           after(:each) { after_run = true }
           after(:each) { raise "FOO" }
-          example('example') { 1.should == 1 }
+          example('example') { 1.should eq(1) }
         end
         group.run
         after_run.should be_true, "expected after(:each) to be run"
@@ -146,11 +161,11 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       it "stores the exception" do
         group = RSpec::Core::ExampleGroup.describe
         group.after(:each) { raise "FOO" }
-        example = group.example('example') { 1.should == 1 }
+        example = group.example('example') { 1.should eq(1) }
 
         group.run
 
-        example.metadata[:execution_result][:exception].message.should == "FOO"
+        example.metadata[:execution_result][:exception].message.should eq("FOO")
       end
     end
 
@@ -185,14 +200,15 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
           after(:each)  { @after_each = :after_each }
           after(:all)   { @after_all  = :after_all }
         end
-        example = group.example("does something") do
-          @in_example = :in_example
+        group.example("does something") do
+          @before_all.should eq(:before_all)
+          @before_each.should eq(:before_each)
         end
-        example_group_instance = group.new
-        example.run(example_group_instance, double('reporter').as_null_object)
-
-        %w[@before_all @before_each @after_each @after_all].each do |ivar|
-          example_group_instance.instance_variable_get(ivar).should be_nil
+        group.run(double.as_null_object).should be_true
+        group.new do |example|
+          %w[@before_all @before_each @after_each @after_all].each do |ivar|
+            example.instance_variable_get(ivar).should be_nil
+          end
         end
       end
 
@@ -269,4 +285,5 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
 
   end
+
 end

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

@@ -8,7 +8,7 @@ describe RSpec::Core::Formatters::BaseFormatter do
 
   describe "backtrace_line" do
     it "trims current working directory" do
-      formatter.__send__(:backtrace_line, File.expand_path(__FILE__)).should == "./spec/rspec/core/formatters/base_formatter_spec.rb"
+      formatter.__send__(:backtrace_line, File.expand_path(__FILE__)).should eq("./spec/rspec/core/formatters/base_formatter_spec.rb")
     end
 
     it "leaves the original line intact" do
@@ -51,7 +51,7 @@ describe RSpec::Core::Formatters::BaseFormatter do
 
         example = mock(:Example, :file_path => __FILE__)
         formatter.send(:read_failed_line, exception, example).should
-          eql %Q{        exception = mock(:Exception, :backtrace => [ "\#{__FILE__}:\#{__LINE__}"])\n}
+          eql(%Q{        exception = mock(:Exception, :backtrace => [ "\#{__FILE__}:\#{__LINE__}"])\n})
       end
 
     end
@@ -73,7 +73,7 @@ describe RSpec::Core::Formatters::BaseFormatter do
     end
 
     it "removes lines from rspec and lines that come before the invocation of the at_exit autorun hook" do
-      formatter.format_backtrace(backtrace, stub.as_null_object).should == ["./my_spec.rb:5"]
+      formatter.format_backtrace(backtrace, stub.as_null_object).should eq(["./my_spec.rb:5"])
     end
   end
 

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

@@ -47,7 +47,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       run_all_and_dump_failures
 
       output.string.should =~ /group name example name/m
-      output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m
+      output.string.should =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
     end
 
     context "with an exception without a message" do
@@ -165,6 +165,154 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
     end
   end
 
+  describe "#dump_pending" do
+    let(:group) { RSpec::Core::ExampleGroup.describe("group name") }
+
+    before { RSpec.configuration.stub(:color_enabled?) { false } }
+
+    def run_all_and_dump_pending
+      group.run(formatter)
+      formatter.dump_pending
+    end
+
+    context "with show_failures_in_pending_blocks setting enabled" do
+      before { RSpec.configuration.stub(:show_failures_in_pending_blocks?) { true } }
+
+      it "preserves formatting" do
+        group.example("example name") { pending { "this".should eq("that") } }
+
+        run_all_and_dump_pending
+
+        output.string.should =~ /group name example name/m
+        output.string.should =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
+      end
+
+      context "with an exception without a message" do
+        it "does not throw NoMethodError" do
+          exception_without_message = Exception.new()
+          exception_without_message.stub(:message) { nil }
+          group.example("example name") { pending { raise exception_without_message } }
+          expect { run_all_and_dump_pending }.not_to raise_error(NoMethodError)
+        end
+      end
+
+      context "with an exception class other than RSpec" do
+        it "does not show the error class" do
+          group.example("example name") { pending { raise NameError.new('foo') } }
+          run_all_and_dump_pending
+          output.string.should =~ /NameError/m
+        end
+      end
+
+      context "with a failed expectation (rspec-expectations)" do
+        it "does not show the error class" do
+          group.example("example name") { pending { "this".should eq("that") } }
+          run_all_and_dump_pending
+          output.string.should_not =~ /RSpec/m
+        end
+      end
+
+      context "with a failed message expectation (rspec-mocks)" do
+        it "does not show the error class" do
+          group.example("example name") { pending { "this".should_receive("that") } }
+          run_all_and_dump_pending
+          output.string.should_not =~ /RSpec/m
+        end
+      end
+
+      context 'for #share_examples_for' do
+        it 'outputs the name and location' do
+
+          share_examples_for 'foo bar' do
+            it("example name") { pending { "this".should eq("that") } }
+          end
+
+          line = __LINE__.next
+          group.it_should_behave_like('foo bar')
+
+          run_all_and_dump_pending
+
+          output.string.should include(
+            'Shared Example Group: "foo bar" called from ' +
+            "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+          )
+        end
+
+        context 'that contains nested example groups' do
+          it 'outputs the name and location' do
+            share_examples_for 'foo bar' do
+              describe 'nested group' do
+                it("example name") { pending { "this".should eq("that") } }
+              end
+            end
+
+            line = __LINE__.next
+            group.it_should_behave_like('foo bar')
+
+            run_all_and_dump_pending
+
+            output.string.should include(
+              'Shared Example Group: "foo bar" called from ' +
+              "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+            )
+          end
+        end
+      end
+
+      context 'for #share_as' do
+        it 'outputs the name and location' do
+
+          share_as :FooBar2 do
+            it("example name") { pending { "this".should eq("that") } }
+          end
+
+          line = __LINE__.next
+          group.send(:include, FooBar2)
+
+          run_all_and_dump_pending
+
+          output.string.should include(
+            'Shared Example Group: "FooBar2" called from ' +
+            "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+          )
+        end
+
+        context 'that contains nested example groups' do
+          it 'outputs the name and location' do
+
+            share_as :NestedFoo2 do
+              describe 'nested group' do
+                describe 'hell' do
+                  it("example name") { pending { "this".should eq("that") } }
+                end
+              end
+            end
+
+            line = __LINE__.next
+            group.send(:include, NestedFoo2)
+
+            run_all_and_dump_pending
+
+            output.string.should include(
+              'Shared Example Group: "NestedFoo2" called from ' +
+              "./spec/rspec/core/formatters/base_text_formatter_spec.rb:#{line}"
+            )
+          end
+        end
+      end
+    end
+
+    context "with show_failures_in_pending_blocks setting disabled" do
+      before { RSpec.configuration.stub(:show_failures_in_pending_blocks?) { false } }
+
+      it "does not output the failure information" do
+        group.example("example name") { pending { "this".should eq("that") } }
+        run_all_and_dump_pending
+        output.string.should_not =~ /(\s+)expected: \"that\"\n\1     got: \"this\"/m
+      end
+    end
+  end
+
   describe "#dump_profile" do
     before do
       formatter.stub(:examples) do

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

@@ -7,22 +7,22 @@ describe RSpec::Core::Formatters::Helpers do
   describe "format seconds" do
     context "sub second times" do
       it "returns 5 digits of precision" do
-        helper.format_seconds(0.000006).should == "0.00001"
+        helper.format_seconds(0.000006).should eq("0.00001")
       end
 
       it "strips off trailing zeroes beyond sub-second precision" do
-        helper.format_seconds(0.020000).should == "0.02"
+        helper.format_seconds(0.020000).should eq("0.02")
       end
 
       context "0" do
         it "strips off trailing zeroes" do
-          helper.format_seconds(0.00000000001).should == "0"
+          helper.format_seconds(0.00000000001).should eq("0")
         end
       end
 
       context "> 1" do
         it "strips off trailing zeroes" do
-          helper.format_seconds(1.00000000001).should == "1"
+          helper.format_seconds(1.00000000001).should eq("1")
         end
       end
     end
@@ -30,13 +30,13 @@ describe RSpec::Core::Formatters::Helpers do
     context "second and greater times" do
 
       it "returns 2 digits of precision" do
-        helper.format_seconds(50.330340).should == "50.33"
+        helper.format_seconds(50.330340).should eq("50.33")
       end
 
       it "returns human friendly elasped time" do
-        helper.format_seconds(50.1).should == "50.1"
-        helper.format_seconds(5).should == "5"
-        helper.format_seconds(5.0).should == "5"
+        helper.format_seconds(50.1).should eq("50.1")
+        helper.format_seconds(5).should eq("5")
+        helper.format_seconds(5.0).should eq("5")
       end
 
     end

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

@@ -313,13 +313,36 @@ a {
       <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: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>
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyHash.java:1063:in `fetch'
+org/jruby/RubyProc.java:274:in `call'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyIO.java:1111:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyDir.java:335:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyKernel.java:2078:in `instance_exec'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:233:in `call'</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>
+<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="number">1</span><span class="punct">.</span><span class="ident">should</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>
       </div>
     </dd>
   </dl>
@@ -341,18 +364,41 @@ org/jruby/RubyArray.java:2336:in `collect'</pre></div>
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_2">
         <div class="message"><pre>
-expected 2
-     got 1
+expected: 2
+     got: 1
 
 (compared using ==)
 </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>
-<span class="linenum">30</span>      <span class="keyword">end</span></code></pre>
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyHash.java:1063:in `fetch'
+org/jruby/RubyProc.java:274:in `call'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyIO.java:1111:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyDir.java:335:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyKernel.java:2078:in `instance_exec'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:233:in `call'</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>
+<span class="offending"><span class="linenum">33</span>    <span class="number">1</span><span class="punct">.</span><span class="ident">should</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>
       </div>
     </dd>
   </dl>
@@ -370,8 +416,30 @@ org/jruby/RubyArray.java:2336:in `collect'</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>
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+./spec/rspec/core/formatters/html_formatter_spec.rb:24:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyHash.java:1063:in `fetch'
+org/jruby/RubyProc.java:274:in `call'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyIO.java:1111:in `open'
+./spec/rspec/core/formatters/html_formatter_spec.rb:46:in `Formatters'
+org/jruby/RubyDir.java:335:in `chdir'
+./spec/rspec/core/formatters/html_formatter_spec.rb:45:in `Formatters'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyKernel.java:2061:in `instance_eval'
+org/jruby/RubyKernel.java:2078:in `instance_exec'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:229:in `call'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyArray.java:2336:in `collect'
+org/jruby/RubyProc.java:274:in `call'
+org/jruby/RubyProc.java:233:in `call'</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>