From 0ccdeeb6b589b486f9ffdfb56cbbf901ec955d88 Mon Sep 17 00:00:00 2001 From: kennyj Date: Wed, 7 Mar 2012 03:17:14 +0900 Subject: Change the string to use in test case. Conflicts: activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb activerecord/test/cases/adapters/mysql2/schema_test.rb --- activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | 2 +- activerecord/test/cases/adapters/mysql2/schema_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb index 749d50fe12..52b4e48dde 100644 --- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb +++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb @@ -88,7 +88,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/database 'foo-bar'/, e.inspect) end end diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb index fd9996c937..de4d9c2b33 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb @@ -42,7 +42,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/database 'foo-bar'/, e.inspect) end end -- cgit v1.2.3