rspec-expectations 2.14.0 → 2.14.1

data/Changelog.md

@@ -1,3 +1,12 @@
+### 2.14.1 / 2013-08-08
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.0...2.14.1)
+
+Bug fixes
+
+* Ensure diff output uses the same encoding as the encoding of
+  the string being diff'd to prevent `Encoding::UndefinedConversionError`
+  errors (Jon Rowe).
+
 ### 2.14.0 / 2013-07-06
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.0.rc1...v2.14.0)
 

data/features/support/rubinius.rb

@@ -0,0 +1,6 @@
+# Required until https://github.com/rubinius/rubinius/issues/2430 is resolved
+ENV['RBXOPT'] = "#{ENV["RBXOPT"]} -Xcompiler.no_rbc"
+
+Around "@unsupported-on-rbx" do |scenario, block|
+  block.call unless defined?(Rubinius)
+end

data/lib/rspec/expectations/differ.rb

@@ -107,8 +107,15 @@ module RSpec
       def object_to_string(object)
         case object
         when Hash
-          object.keys.sort_by { |k| k.to_s }.map do |k|
-            %(#{PP.singleline_pp(k, "")} => #{PP.singleline_pp(object[k], "")})
+          object.keys.sort_by { |k| k.to_s }.map do |key|
+            pp_key   = PP.singleline_pp(key, "")
+            pp_value = PP.singleline_pp(object[key], "")
+
+            # on 1.9.3 PP seems to minimise to US-ASCII, ensure we're matching source encoding
+            #
+            # note, PP is used to ensure the ordering of the internal values of key/value e.g.
+            # <# a: b: c:> not <# c: a: b:>
+            matching_encoding("#{pp_key} => #{pp_value}", key)
           end.join(",\n")
         when String
           object =~ /\n/ ? object : object.inspect

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.14.0'
+      STRING = '2.14.1'
     end
   end
 end

data/spec/rspec/expectations/differ_spec.rb

@@ -137,6 +137,17 @@ EOD
           expect(diff).to eq expected_diff
         end
 
+        it 'outputs unified diff messaoge of two hashes with differing encoding' do
+          expected_diff = %Q{
+@@ -1,2 +1,2 @@
+-"a" => "a"
+#{ (RUBY_VERSION.to_f > 1.8) ?  %Q{+"ö" => "ö"} : '+"\303\266" => "\303\266"' }
+}
+
+          diff = differ.diff_as_object({'ö' => 'ö'}, {'a' => 'a'})
+          expect(diff).to eq expected_diff
+        end
+
         it "outputs unified diff of single line strings" do
           expected = "this is one string"
           actual   = "this is another string"

data/spec/rspec/matchers/raise_error_spec.rb

@@ -16,8 +16,8 @@ describe "expect { ... }.to raise_error" do
   end
 
   it "fails if a different error instance is thrown from the one that is expected" do
-    s = StandardError.new :bees
-    to_raise = StandardError.new(:faces)
+    s = StandardError.new("Error 1")
+    to_raise = StandardError.new("Error 2")
     expect do
       expect {raise to_raise}.to raise_error(s)
     end.to fail_with(Regexp.new("expected #{s.inspect}, got #{to_raise.inspect} with backtrace"))

metadata

@@ -2,7 +2,7 @@
 name: rspec-expectations
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
 - spec/rspec/expectations/differ_spec.rb
@@ -233,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2919541554530046896
+      hash: 1211748927981190592
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -242,14 +243,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2919541554530046896
+      hash: 1211748927981190592
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.14.0
+summary: rspec-expectations-2.14.1
 test_files:
 - features/README.md
 - features/Upgrade.md
@@ -283,6 +284,7 @@ test_files:
 - features/implicit_docstrings.feature
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
+- features/support/rubinius.rb
 - features/syntax_configuration.feature
 - features/test_frameworks/test_unit.feature
 - spec/rspec/expectations/differ_spec.rb