Merge remote-tracking branch 'larskanis/fix-encoding-tests-v2'

Conflicts: test/xml/test_node_encoding.rb This is a more simple fix than commit da996ae .
larskanis · Jan 4, 2016 · 6b5be24 · 6b5be24
2 parents 062c7a4 + c038246
commit 6b5be24
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/xml/test_node_encoding.rb b/test/xml/test_node_encoding.rb
@@ -6,7 +6,7 @@ module XML
     class TestNodeEncoding < Nokogiri::TestCase
       def setup
         super
-        @html = Nokogiri::HTML(File.read(HTML_FILE, encoding: Encoding::UTF_8), HTML_FILE)
+        @html = Nokogiri::HTML(File.open(HTML_FILE, "rb"))
       end
 
       def test_get_attribute