Merge pull request #1106 from lgierth/dont-extend-exception

Don't extend exception

Conflicts:
	Changelog.md
	lib/rspec/core/pending.rb

Author: JonRowe

Changelog.md

@@ -28,6 +28,7 @@ Deprecations
   RSpec 3 will not support having this option set to `false` (Myron Marston).
 * Deprecate accessing a `let` or `subject` declaration in
   a `after(:all)` hook. (Myron Marston, Jon Rowe)
+* Fix an issue that prevented the use of frozen error objects. (Lars Gierth)
 
 ### 2.14.5 / 2013-08-13
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.4...v2.14.5)

lib/rspec/core/example.rb

@@ -261,14 +261,8 @@ def start(reporter)
         record :started_at => RSpec::Core::Time.now
       end
 
-      # @private
-      module NotPendingExampleFixed
-        def pending_fixed?; false; end
-      end
-
       def finish(reporter)
         if @exception
-          @exception.extend(NotPendingExampleFixed) unless @exception.respond_to?(:pending_fixed?)
           record_finished 'failed', :exception => @exception
           reporter.example_failed self
           false

lib/rspec/core/formatters/base_text_formatter.rb

@@ -285,7 +285,7 @@ def dump_pending_fixed(example, index)
         end
 
         def pending_fixed?(example)
-          example.execution_result[:exception].pending_fixed?
+          example.execution_result[:pending_fixed]
         end
 
         def dump_failure(example, index)

lib/rspec/core/formatters/html_formatter.rb

@@ -94,7 +94,7 @@ def example_failed(example)
           extra = extra_failure_content(exception)
 
           @printer.print_example_failed(
-            exception.pending_fixed?,
+            example.execution_result[:pending_fixed],
             example.description,
             example.execution_result[:run_time],
             @failed_examples.size,

lib/rspec/core/pending.rb

@@ -11,10 +11,6 @@ class PendingExampleFixedError < Test::Unit::AssertionFailedError; end
         class PendingExampleFixedError < StandardError; end
       end
 
-      class PendingExampleFixedError
-        def pending_fixed?; true; end
-      end
-
       NO_REASON_GIVEN = 'No reason given'
       NOT_YET_IMPLEMENTED = 'Not yet implemented'
 
@@ -87,6 +83,7 @@ def pending(*args)
 
         RSpec.current_example.metadata[:pending] = true
         RSpec.current_example.metadata[:execution_result][:pending_message] = message
+        RSpec.current_example.execution_result[:pending_fixed] = false
         if block_given?
           begin
             result = begin
@@ -99,7 +96,10 @@ def pending(*args)
           ensure
             teardown_mocks_for_rspec
           end
-          raise PendingExampleFixedError.new if result
+          if result
+            RSpec.current_example.execution_result[:pending_fixed] = true
+            raise PendingExampleFixedError.new
+          end
         end
         raise PendingDeclaredInExample.new(message)
       end

spec/rspec/core/example_spec.rb

@@ -45,20 +45,6 @@ def capture_stdout
       example_group.run
       expect(example.exception).to be_nil
     end
-
-    it "returns false for pending_fixed? if not pending fixed" do
-      example = example_group.example { fail }
-      example_group.run
-      expect(example.exception).not_to be_pending_fixed
-    end
-
-    it "returns true for pending_fixed? if pending fixed" do
-      example = example_group.example do
-        pending("fixed") {}
-      end
-      example_group.run
-      expect(example.exception).to be_pending_fixed
-    end
   end
 
   describe "when there is an explicit description" do
@@ -345,6 +331,22 @@ def run_and_capture_reported_message(group)
         message = run_and_capture_reported_message(group)
         expect(message).to be_nil
       end
+
+      it "leaves a raised exception unmodified (GH-1103)" do
+        # set the backtrace, otherwise MRI will build a whole new object,
+        # and thus mess with our expectations. Rubinius and JRuby are not
+        # affected.
+        exception = StandardError.new
+        exception.set_backtrace([])
+
+        group = RSpec::Core::ExampleGroup.describe do
+          example { raise exception.freeze }
+        end
+        group.run
+
+        actual = group.examples.first.metadata[:execution_result][:exception]
+        expect(actual.__id__).to eq(exception.__id__)
+      end
     end
   end
 
@@ -370,6 +372,30 @@ def run_and_capture_reported_message(group)
         group.run
         expect(blah).to be(:success)
       end
+
+      context "with a block" do
+        it "sets the example to pending if block fails" do
+          group = RSpec::Core::ExampleGroup.describe do
+            example do
+              pending { expect(1).to eq(2) }
+            end
+          end
+          group.run
+          expect(group.examples.first.metadata[:execution_result][:status]).to eq('pending')
+          expect(group.examples.first.metadata[:execution_result][:pending_fixed]).to eq(false)
+        end
+
+        it "fails if block is fixed, i.e. does not raise" do
+          group = RSpec::Core::ExampleGroup.describe do
+            example do
+              pending {}
+            end
+          end
+          group.run
+          expect(group.examples.first.metadata[:execution_result][:status]).to eq('failed')
+          expect(group.examples.first.metadata[:execution_result][:pending_fixed]).to eq(true)
+        end
+      end
     end
 
     context "in before(:each)" do