aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-08 04:00:02 -0800
committerJosé Valim <jose.valim@gmail.com>2012-03-08 04:00:02 -0800
commit58a55595ca0f23445488b590bf29890244fb2675 (patch)
treeb97fd31511fcaf4721624be0710d0e405580b951 /activerecord
parentefc0d0373e04705a90dd89dd352274bd8e409ca1 (diff)
parent37802dd51ec1e1b29743be2a3d02106f930e04ba (diff)
downloadrails-58a55595ca0f23445488b590bf29890244fb2675.tar.gz
rails-58a55595ca0f23445488b590bf29890244fb2675.tar.bz2
rails-58a55595ca0f23445488b590bf29890244fb2675.zip
Merge pull request #5306 from kennyj/fix_69c7f02
Change the message string to use in test case.
Diffstat (limited to 'activerecord')
-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 5d6de90889..5aa4743e7b 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -52,7 +52,7 @@ module ActiveRecord
flunk
rescue => e
# assertion for *quoted* database properly
- assert_match(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, 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 10fdf88592..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(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, e.inspect)
+ assert_match(/database 'foo-bar'/, e.inspect)
end
end