lib/test/unit/diff.rb in test-unit-2.0.7 vs lib/test/unit/diff.rb in test-unit-2.0.8

@@ -715,10 +715,19 @@
         diff(UnifiedDiffer, from, to, options)
       end
 
       def diff(differ_class, from, to, options={})
         differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
-        differ.diff(options).join("\n")
+        lines = differ.diff(options)
+        if Object.const_defined?(:EncodingError)
+          begin
+            lines.join("\n")
+          rescue EncodingError
+            lines.collect {|line| line.force_encoding("ASCII-8BIT")}.join("\n")
+          end
+        else
+          lines.join("\n")
+        end
       end
     end
   end
 end