aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-03-07 03:17:14 +0900
committerAaron Patterson <aaron.patterson@gmail.com>2012-06-11 11:00:29 -0700
commit0ccdeeb6b589b486f9ffdfb56cbbf901ec955d88 (patch)
treea78b78eb33ee7b5ce5f17e9572da20e8e181fceb
parent22994b2d638738abce7dc7672c27a5e7171018e8 (diff)
downloadrails-0ccdeeb6b589b486f9ffdfb56cbbf901ec955d88.tar.gz
rails-0ccdeeb6b589b486f9ffdfb56cbbf901ec955d88.tar.bz2
rails-0ccdeeb6b589b486f9ffdfb56cbbf901ec955d88.zip
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
-rw-r--r--activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb2
-rw-r--r--activerecord/test/cases/adapters/mysql2/schema_test.rb2
2 files changed, 2 insertions, 2 deletions
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