Merge pull request #2575 from benoittgt/deal_with_encoding_error

Handle RSpec description with japanese char in CP932 encoded files

Author: benoittgt

appveyor.yml

@@ -29,7 +29,7 @@ before_test:
   - bundle --version
 
 test_script:
-  - bundle exec rspec --backtrace
+  - chcp 65001 && bundle exec rspec --backtrace
 
 environment:
   matrix:

lib/rspec/core/formatters/exception_presenter.rb

@@ -81,7 +81,7 @@ def fully_formatted(failure_number, colorizer=::RSpec::Core::Formatters::Console
 
         def fully_formatted_lines(failure_number, colorizer)
           lines = [
-            description,
+            encoded_description(description),
             detail_formatter.call(example, colorizer),
             formatted_message_and_backtrace(colorizer),
             extra_detail_formatter.call(failure_number, colorizer),
@@ -244,6 +244,17 @@ def formatted_message_and_backtrace(colorizer)
           end
         end
 
+        if  String.method_defined?(:encoding)
+          def encoded_description(description)
+            return if description.nil?
+            encoded_string(description)
+          end
+        else # for 1.8.7
+          def encoded_description(description)
+            description
+          end
+        end
+
         def exception_backtrace
           exception.backtrace || []
         end

spec/rspec/core/formatters/exception_presenter_spec.rb

@@ -94,6 +94,23 @@ module RSpec::Core
         EOS
       end
 
+      if String.method_defined?(:encoding)
+        it 'allows the caller to add encoded description' do
+          the_presenter = Formatters::ExceptionPresenter.new(exception, example,
+                                                             :description => "ジ".encode("CP932"))
+
+          expect(the_presenter.fully_formatted(1)).to eq(<<-EOS.gsub(/^ +\|/, ''))
+          |
+          |  1) ジ
+          |     Failure/Error: # The failure happened here!#{ encoding_check }
+          |
+          |       Boom
+          |       Bam
+          |     # ./spec/rspec/core/formatters/exception_presenter_spec.rb:#{line_num}
+          EOS
+        end
+      end
+
       it 'allows the caller to omit the description' do
         the_presenter = Formatters::ExceptionPresenter.new(exception, example,
                                                        :detail_formatter => Proc.new { "Detail!" },