aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-08-19 22:10:06 +0930
committerGitHub <noreply@github.com>2017-08-19 22:10:06 +0930
commit55273a32c5d153294f048bac8410c7b9bf060ae1 (patch)
treeb837fed37de1327c8531e736eb9f957e3751a35d /activerecord/test
parent8a41e77506cf8bb99368d321f5723bf83d518588 (diff)
parent5f30660ef41450d13f7b61b2df92d2ca37215f7e (diff)
downloadrails-55273a32c5d153294f048bac8410c7b9bf060ae1.tar.gz
rails-55273a32c5d153294f048bac8410c7b9bf060ae1.tar.bz2
rails-55273a32c5d153294f048bac8410c7b9bf060ae1.zip
Merge pull request #30324 from koic/fix_cant_modify_frozen_string_in_ar_test
Fix `can't modify frozen String` error in an AR test
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/adapter_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index d7551cd658..9aaa2852d0 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -288,11 +288,11 @@ module ActiveRecord
def test_log_invalid_encoding
error = assert_raises RuntimeError do
@connection.send :log, "SELECT 'ы' FROM DUAL" do
- raise "ы".force_encoding(Encoding::ASCII_8BIT)
+ raise "ы".dup.force_encoding(Encoding::ASCII_8BIT)
end
end
- assert_not_nil error.message
+ assert_equal "ы", error.message
end
end
end