aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 07:26:39 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 07:26:39 +0000
commit7a608ada8f7e0f39fb2eec0148ce93a8190d079b (patch)
tree5c3abb31c8728d4b455c3ce3fabbe498b3906759
parente1062b23b456e9499282e69eaacb5d44a5ec81be (diff)
downloadruby-7a608ada8f7e0f39fb2eec0148ce93a8190d079b.tar.gz
* test/rexml/test_encoding.rb
(REXMLTests::EncodingTester#test_ticket_110): Fix expected and actual order. Patch by NAKAMURA Usaku. Thanks!!! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--test/rexml/test_encoding.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db58339544..9bc6d3f105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 23 16:18:11 2014 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/test_encoding.rb
+ (REXMLTests::EncodingTester#test_ticket_110): Fix expected and
+ actual order.
+ Patch by NAKAMURA Usaku. Thanks!!!
+
Thu Oct 23 10:47:16 2014 Eric Wong <e@80x24.org>
* insns.def (getlocal,setlocal): add comment to def/opt_operand.def
diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb
index 3b2a56ac5e..ca2dff7af1 100644
--- a/test/rexml/test_encoding.rb
+++ b/test/rexml/test_encoding.rb
@@ -91,7 +91,7 @@ module REXMLTests
utf16 = File.open(fixture_path("ticket_110_utf16.xml")) do |f|
REXML::Document.new(f)
end
- assert_equal(utf16.encoding, "UTF-16")
+ assert_equal("UTF-16", utf16.encoding)
assert( utf16[0].kind_of?(REXML::XMLDecl))
end
end