diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-02 14:54:42 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-11-02 14:54:42 +0000 |
| commit | 22e17695672f266c85e36ed36d847fc3f65d5dea (patch) | |
| tree | bf2985b36f56a14d9a2b3fb32036758de54013eb /activerecord | |
| parent | 63c014547efb6bce6945d09aa4f14dc50a54b71d (diff) | |
| parent | 26967754b023660b5cde53defc5e376e1d3101c0 (diff) | |
| download | rails-22e17695672f266c85e36ed36d847fc3f65d5dea.tar.gz rails-22e17695672f266c85e36ed36d847fc3f65d5dea.tar.bz2 rails-22e17695672f266c85e36ed36d847fc3f65d5dea.zip | |
Merge pull request #22156 from yui-knk/fix_test_mysql
Fix test_database_created_by_root of mysql
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/tasks/mysql_rake_test.rb | 2 |
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 |