aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2015-11-02 23:30:16 +0900
committeryui-knk <spiketeika@gmail.com>2015-11-02 23:30:16 +0900
commit26967754b023660b5cde53defc5e376e1d3101c0 (patch)
treedf898641ce8f418fe5d88c09cb7f61a8b15de583
parentab3510367bd4622f836374e5a37e54381ea72fc6 (diff)
downloadrails-26967754b023660b5cde53defc5e376e1d3101c0.tar.gz
rails-26967754b023660b5cde53defc5e376e1d3101c0.tar.bz2
rails-26967754b023660b5cde53defc5e376e1d3101c0.zip
Fix test_database_created_by_root of mysql
`DEFAULT_CHARSET` and `DEFAULT_COLLATION` in `MySQLDatabaseTasks` was changed by 322068fe85278ea26e26da6dfd7c5612dab15a72. This test case also should be changed.
-rw-r--r--activerecord/test/cases/tasks/mysql_rake_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 5cbe7e30aa..723a7618ba 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -104,7 +104,7 @@ module ActiveRecord
def test_database_created_by_root
assert_permissions_granted_for "pat"
@connection.expects(:create_database).
- with('my-app-db', :charset => 'utf8', :collation => 'utf8_unicode_ci')
+ with('my-app-db', {})
ActiveRecord::Tasks::DatabaseTasks.create @configuration
end