diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-01 12:57:48 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-01 12:58:41 -0300 |
commit | aafa00f4c10a6791e6470112f0f1fbe5f2c3f649 (patch) | |
tree | eba2b5554545cc2a84933f443763a28d9f4c0a8f /activerecord/test/cases/tasks/postgresql_rake_test.rb | |
parent | 36938b410e7c7396ee5934246fddc048b898f7ef (diff) | |
download | rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.gz rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.tar.bz2 rails-aafa00f4c10a6791e6470112f0f1fbe5f2c3f649.zip |
Unify the collation API for the database adpters
Diffstat (limited to 'activerecord/test/cases/tasks/postgresql_rake_test.rb')
-rw-r--r-- | activerecord/test/cases/tasks/postgresql_rake_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb index df1075d816..62acd53003 100644 --- a/activerecord/test/cases/tasks/postgresql_rake_test.rb +++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb @@ -38,12 +38,12 @@ module ActiveRecord merge('encoding' => 'latin') end - def test_creates_database_with_given_collate_and_ctype + def test_creates_database_with_given_collation_and_ctype @connection.expects(:create_database). - with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collate' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8')) + with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8')) ActiveRecord::Tasks::DatabaseTasks.create @configuration. - merge('collate' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8') + merge('collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8') end def test_establishes_connection_to_new_database @@ -172,7 +172,7 @@ module ActiveRecord end def test_db_retrieves_collation - @connection.expects(:collate) + @connection.expects(:collation) ActiveRecord::Tasks::DatabaseTasks.collation @configuration end end |