From 9b366b95f9aeb50388af6d247944ed63751b570a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
<rafaelmfranca@gmail.com>
Date: Fri, 2 Jan 2015 18:58:46 -0300
Subject: Don't test invalid log encoding against PostgreSQL adapter
It already treats the message
---
activerecord/test/cases/adapter_test.rb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'activerecord/test')
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 6656a9bf50..99e3d7021d 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -214,10 +214,12 @@ module ActiveRecord
assert_equal "special_db_type", @connection.type_to_sql(:special_db_type)
end
- def test_log_invalid_encoding
- assert_raise ActiveRecord::StatementInvalid do
- @connection.send :log, "SELECT 'ы' FROM DUAL" do
- raise 'ы'.force_encoding(Encoding::ASCII_8BIT)
+ unless current_adapter?(:PostgreSQLAdapter)
+ def test_log_invalid_encoding
+ assert_raise ActiveRecord::StatementInvalid do
+ @connection.send :log, "SELECT 'ы' FROM DUAL" do
+ raise 'ы'.force_encoding(Encoding::ASCII_8BIT)
+ end
end
end
end
--
cgit v1.2.3