rspec-core 2.14.5 → 2.14.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGY4NjE0Y2VlYmNhNGIwMGQ1NmFhMTgyODY5MTg4MWUzZDYzODNkOA==
+  data.tar.gz: !binary |-
+    NzA5NDYzZmM4MzE5NjZkZTcwNTVkZmY2ZDY1NzZlYWI3MTU5NzJkOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2IyZWNhMzBmNWZkYzcxZTI2MGQ2MmZiNDA1ODE3ODE4MGExYmYwY2E2MWMx
+    MjYzNmI1NmYxNzhiNmEyN2NkNzY5NmRlOTFhOWExN2Y0MmQ4ODEzZTY1ZDll
+    ZTkxYTlkN2JjMWJmNzE3ZmZlY2E1NzU1NDYwYWJkOWNmMzA0ZjA=
+  data.tar.gz: !binary |-
+    MGM2OTRiZDI5YzdhOTk3NmIwZTJlN2M4OTJmZTRjODEwMGQzOWJmOWQ0MTEy
+    ZjVkYzJmMTBhMmZlYmI2NWQxYjgzODdlMDI3YWE5ODNkOTY1MTBkMDdhZmYz
+    YWNkNGRkODI4MDMxYzUxMjhjNDM2NDE5MTBkODdmYzU0NDJjNjY=

data/Changelog.md

@@ -1,3 +1,12 @@
+### 2.14.6 / 2013-10-15
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.5...v2.14.6)
+
+Bug fixes:
+
+* Format stringified numbers correctly when mathn library is loaded.
+  (Jay Hayes)
+* 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)
 

data/lib/rspec/core/example.rb

@@ -264,14 +264,8 @@ An error occurred #{context}
         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

data/lib/rspec/core/formatters/base_text_formatter.rb

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

data/lib/rspec/core/formatters/helpers.rb

@@ -51,7 +51,7 @@ module RSpec
                       end
 
           if duration > 60
-            minutes = duration.to_i / 60
+            minutes = (duration.to_i / 60).to_i
             seconds = duration - minutes * 60
 
             "#{pluralize(minutes, 'minute')} #{pluralize(format_seconds(seconds, precision), 'second')}"

data/lib/rspec/core/formatters/html_formatter.rb

@@ -94,7 +94,7 @@ module RSpec
           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,
@@ -128,7 +128,7 @@ module RSpec
         def percent_done
           result = 100.0
           if @example_count > 0
-            result = ((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
+            result = (((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0).to_f
           end
           result
         end

data/lib/rspec/core/pending.rb

@@ -11,10 +11,6 @@ module RSpec
         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 @@ module RSpec
 
         example.metadata[:pending] = true
         example.metadata[:execution_result][:pending_message] = message
+        example.execution_result[:pending_fixed] = false
         if block_given?
           begin
             result = begin
@@ -100,7 +97,10 @@ module RSpec
           ensure
             teardown_mocks_for_rspec
           end
-          raise PendingExampleFixedError.new if result
+          if result
+            example.execution_result[:pending_fixed] = true
+            raise PendingExampleFixedError.new
+          end
         end
         raise PendingDeclaredInExample.new(message)
       end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.5'
+      STRING = '2.14.6'
     end
   end
 end

data/spec/rspec/core/example_spec.rb

@@ -45,20 +45,6 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       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 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         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 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
         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

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

@@ -46,6 +46,16 @@ describe RSpec::Core::Formatters::Helpers do
         expect(helper.format_duration(1)).to eq("1 second")
       end
     end
+
+    context 'with mathn loaded' do
+      include MathnIntegrationSupport
+
+      it "returns 'x minutes xx.x seconds' formatted string" do
+        with_mathn_loaded do
+          expect(helper.format_duration(133.7)).to eq("2 minutes 13.7 seconds")
+        end
+      end
+    end
   end
 
   describe "format seconds" do

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

@@ -68,24 +68,39 @@ module RSpec
             select  {|e| e =~ /formatter_specs\.rb/}
         end
 
-        it "produces HTML identical to the one we designed manually" do
-          Dir.chdir(root) do
-            actual_doc = Nokogiri::HTML(generated_html)
-            actual_backtraces = extract_backtrace_from(actual_doc)
-            actual_doc.css("div.backtrace").remove
-
-            expected_doc = Nokogiri::HTML(expected_html)
-            expected_backtraces = extract_backtrace_from(expected_doc)
-            expected_doc.search("div.backtrace").remove
-
-            expect(actual_doc.inner_html).to eq(expected_doc.inner_html)
-
-            expected_backtraces.each_with_index do |expected_line, i|
-              expected_path, expected_line_number, expected_suffix = expected_line.split(':')
-              actual_path, actual_line_number, actual_suffix = actual_backtraces[i].split(':')
-              expect(File.expand_path(actual_path)).to eq(File.expand_path(expected_path))
-              expect(actual_line_number).to eq(expected_line_number)
-              expect(actual_suffix).to eq(expected_suffix)
+        describe 'produced HTML' do
+          def build_and_verify_formatter_output
+            Dir.chdir(root) do
+              actual_doc = Nokogiri::HTML(generated_html)
+              actual_backtraces = extract_backtrace_from(actual_doc)
+              actual_doc.css("div.backtrace").remove
+
+              expected_doc = Nokogiri::HTML(expected_html)
+              expected_backtraces = extract_backtrace_from(expected_doc)
+              expected_doc.search("div.backtrace").remove
+
+              expect(actual_doc.inner_html).to eq(expected_doc.inner_html)
+
+              expected_backtraces.each_with_index do |expected_line, i|
+                expected_path, expected_line_number, expected_suffix = expected_line.split(':')
+                actual_path, actual_line_number, actual_suffix = actual_backtraces[i].split(':')
+
+                expect(File.expand_path(actual_path)).to eq(File.expand_path(expected_path))
+                expect(actual_line_number).to eq(expected_line_number)
+                expect(actual_suffix).to eq(expected_suffix)
+              end
+            end
+          end
+
+          it "produces HTML 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 }
             end
           end
         end

data/spec/support/in_sub_process.rb

@@ -0,0 +1,37 @@
+module InSubProcess
+  if RUBY_PLATFORM == 'java'
+    def in_sub_process
+      pending "This spec requires forking to work properly, " +
+              "and JRuby does not support forking"
+    end
+  else
+    # Useful as a way to isolate a global change to a subprocess.
+    def in_sub_process
+      readme, writeme = IO.pipe
+
+      pid = Process.fork do
+        exception = nil
+        begin
+          yield
+        rescue Exception => e
+          exception = e
+        end
+
+        writeme.write Marshal.dump(exception)
+
+        readme.close
+        writeme.close
+        exit! # prevent at_exit hooks from running (e.g. minitest)
+      end
+
+      writeme.close
+      Process.waitpid(pid)
+
+      exception = Marshal.load(readme.read)
+      readme.close
+
+      raise exception if exception
+    end
+  end
+end
+

data/spec/support/mathn_integration_support.rb

@@ -0,0 +1,12 @@
+require 'support/in_sub_process'
+
+module MathnIntegrationSupport
+  include InSubProcess
+
+  def with_mathn_loaded
+    in_sub_process do
+      require 'mathn'
+      yield
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-core
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.14.5
+  version: 2.14.6
 platform: ruby
 authors:
 - Steven Baker
@@ -11,152 +10,134 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-    none: false
-  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
-    none: false
-  prerelease: false
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.9
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
-  prerelease: false
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.6'
-    none: false
-  prerelease: false
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.6'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    none: false
-  prerelease: false
+        version: '4.6'
+- !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.2
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    none: false
-  prerelease: false
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
   name: syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
-    none: false
-  prerelease: false
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
-    none: false
-  prerelease: false
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.4
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
-    none: false
-  prerelease: false
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: BDD for Ruby. RSpec runner and example groups.
 email: rspec-users@rubyforge.org
 executables:
@@ -359,10 +340,12 @@ files:
 - spec/spec_helper.rb
 - spec/support/config_options_helper.rb
 - spec/support/helper_methods.rb
+- spec/support/in_sub_process.rb
 - spec/support/isolate_load_path_mutation.rb
 - spec/support/isolated_directory.rb
 - spec/support/isolated_home_directory.rb
 - spec/support/matchers.rb
+- spec/support/mathn_integration_support.rb
 - spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
 - spec/support/spec_files.rb
@@ -371,6 +354,7 @@ files:
 homepage: http://github.com/rspec/rspec-core
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -381,25 +365,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2492327081030983877
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2492327081030983877
-  none: false
 requirements: []
 rubyforge_project: rspec
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
-summary: rspec-core-2.14.5
+specification_version: 4
+summary: rspec-core-2.14.6
 test_files:
 - features/Autotest.md
 - features/README.md
@@ -537,10 +513,12 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/config_options_helper.rb
 - spec/support/helper_methods.rb
+- spec/support/in_sub_process.rb
 - spec/support/isolate_load_path_mutation.rb
 - spec/support/isolated_directory.rb
 - spec/support/isolated_home_directory.rb
 - spec/support/matchers.rb
+- spec/support/mathn_integration_support.rb
 - spec/support/sandboxed_mock_space.rb
 - spec/support/shared_example_groups.rb
 - spec/support/spec_files.rb