diff options
author | Xavier Noria <fxn@hashref.com> | 2016-08-06 18:26:20 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2016-08-06 18:26:53 +0200 |
commit | 9617db2078e8a85c8944392c21dd748f932bbd80 (patch) | |
tree | 727d60f1d2f9bbb6510483c366f62d75e2647619 /activerecord/test/cases/tasks | |
parent | 4df2b779ddfcb27761c71e00e2b241bfa06a0950 (diff) | |
download | rails-9617db2078e8a85c8944392c21dd748f932bbd80.tar.gz rails-9617db2078e8a85c8944392c21dd748f932bbd80.tar.bz2 rails-9617db2078e8a85c8944392c21dd748f932bbd80.zip |
applies new string literal convention in activerecord/test
The current code base is not uniform. After some discussion,
we have chosen to go with double quotes by default.
Diffstat (limited to 'activerecord/test/cases/tasks')
-rw-r--r-- | activerecord/test/cases/tasks/database_tasks_test.rb | 146 | ||||
-rw-r--r-- | activerecord/test/cases/tasks/mysql_rake_test.rb | 90 | ||||
-rw-r--r-- | activerecord/test/cases/tasks/postgresql_rake_test.rb | 84 | ||||
-rw-r--r-- | activerecord/test/cases/tasks/sqlite_rake_test.rb | 80 |
4 files changed, 200 insertions, 200 deletions
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb index 510bb088c8..946d337572 100644 --- a/activerecord/test/cases/tasks/database_tasks_test.rb +++ b/activerecord/test/cases/tasks/database_tasks_test.rb @@ -1,5 +1,5 @@ -require 'cases/helper' -require 'active_record/tasks/database_tasks' +require "cases/helper" +require "active_record/tasks/database_tasks" module ActiveRecord module DatabaseTasksSetupper @@ -64,12 +64,12 @@ module ActiveRecord instance.expects(:structure_dump).with("awesome-file.sql") ActiveRecord::Tasks::DatabaseTasks.register_task(/foo/, klazz) - ActiveRecord::Tasks::DatabaseTasks.structure_dump({'adapter' => :foo}, "awesome-file.sql") + ActiveRecord::Tasks::DatabaseTasks.structure_dump({"adapter" => :foo}, "awesome-file.sql") end def test_unregistered_task assert_raise(ActiveRecord::Tasks::DatabaseNotSupported) do - ActiveRecord::Tasks::DatabaseTasks.structure_dump({'adapter' => :bar}, "awesome-file.sql") + ActiveRecord::Tasks::DatabaseTasks.structure_dump({"adapter" => :bar}, "awesome-file.sql") end end end @@ -80,20 +80,20 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_create") do eval("@#{v}").expects(:create) - ActiveRecord::Tasks::DatabaseTasks.create 'adapter' => k + ActiveRecord::Tasks::DatabaseTasks.create "adapter" => k end end end class DatabaseTasksCreateAllTest < ActiveRecord::TestCase def setup - @configurations = {'development' => {'database' => 'my-db'}} + @configurations = {"development" => {"database" => "my-db"}} ActiveRecord::Base.stubs(:configurations).returns(@configurations) end def test_ignores_configurations_without_databases - @configurations['development'].merge!('database' => nil) + @configurations["development"].merge!("database" => nil) ActiveRecord::Tasks::DatabaseTasks.expects(:create).never @@ -101,7 +101,7 @@ module ActiveRecord end def test_ignores_remote_databases - @configurations['development'].merge!('host' => 'my.server.tld') + @configurations["development"].merge!("host" => "my.server.tld") $stderr.stubs(:puts).returns(nil) ActiveRecord::Tasks::DatabaseTasks.expects(:create).never @@ -110,15 +110,15 @@ module ActiveRecord end def test_warning_for_remote_databases - @configurations['development'].merge!('host' => 'my.server.tld') + @configurations["development"].merge!("host" => "my.server.tld") - $stderr.expects(:puts).with('This task only modifies local databases. my-db is on a remote host.') + $stderr.expects(:puts).with("This task only modifies local databases. my-db is on a remote host.") ActiveRecord::Tasks::DatabaseTasks.create_all end def test_creates_configurations_with_local_ip - @configurations['development'].merge!('host' => '127.0.0.1') + @configurations["development"].merge!("host" => "127.0.0.1") ActiveRecord::Tasks::DatabaseTasks.expects(:create) @@ -126,7 +126,7 @@ module ActiveRecord end def test_creates_configurations_with_local_host - @configurations['development'].merge!('host' => 'localhost') + @configurations["development"].merge!("host" => "localhost") ActiveRecord::Tasks::DatabaseTasks.expects(:create) @@ -134,7 +134,7 @@ module ActiveRecord end def test_creates_configurations_with_blank_hosts - @configurations['development'].merge!('host' => nil) + @configurations["development"].merge!("host" => nil) ActiveRecord::Tasks::DatabaseTasks.expects(:create) @@ -145,9 +145,9 @@ module ActiveRecord class DatabaseTasksCreateCurrentTest < ActiveRecord::TestCase def setup @configurations = { - 'development' => {'database' => 'dev-db'}, - 'test' => {'database' => 'test-db'}, - 'production' => {'database' => 'prod-db'} + "development" => {"database" => "dev-db"}, + "test" => {"database" => "test-db"}, + "production" => {"database" => "prod-db"} } ActiveRecord::Base.stubs(:configurations).returns(@configurations) @@ -156,37 +156,37 @@ module ActiveRecord def test_creates_current_environment_database ActiveRecord::Tasks::DatabaseTasks.expects(:create). - with('database' => 'prod-db') + with("database" => "prod-db") ActiveRecord::Tasks::DatabaseTasks.create_current( - ActiveSupport::StringInquirer.new('production') + ActiveSupport::StringInquirer.new("production") ) end def test_creates_test_and_development_databases_when_env_was_not_specified ActiveRecord::Tasks::DatabaseTasks.expects(:create). - with('database' => 'dev-db') + with("database" => "dev-db") ActiveRecord::Tasks::DatabaseTasks.expects(:create). - with('database' => 'test-db') + with("database" => "test-db") ActiveRecord::Tasks::DatabaseTasks.create_current( - ActiveSupport::StringInquirer.new('development') + ActiveSupport::StringInquirer.new("development") ) end def test_creates_test_and_development_databases_when_rails_env_is_development - old_env = ENV['RAILS_ENV'] - ENV['RAILS_ENV'] = 'development' + old_env = ENV["RAILS_ENV"] + ENV["RAILS_ENV"] = "development" ActiveRecord::Tasks::DatabaseTasks.expects(:create). - with('database' => 'dev-db') + with("database" => "dev-db") ActiveRecord::Tasks::DatabaseTasks.expects(:create). - with('database' => 'test-db') + with("database" => "test-db") ActiveRecord::Tasks::DatabaseTasks.create_current( - ActiveSupport::StringInquirer.new('development') + ActiveSupport::StringInquirer.new("development") ) ensure - ENV['RAILS_ENV'] = old_env + ENV["RAILS_ENV"] = old_env end def test_establishes_connection_for_the_given_environment @@ -195,7 +195,7 @@ module ActiveRecord ActiveRecord::Base.expects(:establish_connection).with(:development) ActiveRecord::Tasks::DatabaseTasks.create_current( - ActiveSupport::StringInquirer.new('development') + ActiveSupport::StringInquirer.new("development") ) end end @@ -206,20 +206,20 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_drop") do eval("@#{v}").expects(:drop) - ActiveRecord::Tasks::DatabaseTasks.drop 'adapter' => k + ActiveRecord::Tasks::DatabaseTasks.drop "adapter" => k end end end class DatabaseTasksDropAllTest < ActiveRecord::TestCase def setup - @configurations = {:development => {'database' => 'my-db'}} + @configurations = {:development => {"database" => "my-db"}} ActiveRecord::Base.stubs(:configurations).returns(@configurations) end def test_ignores_configurations_without_databases - @configurations[:development].merge!('database' => nil) + @configurations[:development].merge!("database" => nil) ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never @@ -227,7 +227,7 @@ module ActiveRecord end def test_ignores_remote_databases - @configurations[:development].merge!('host' => 'my.server.tld') + @configurations[:development].merge!("host" => "my.server.tld") $stderr.stubs(:puts).returns(nil) ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never @@ -236,15 +236,15 @@ module ActiveRecord end def test_warning_for_remote_databases - @configurations[:development].merge!('host' => 'my.server.tld') + @configurations[:development].merge!("host" => "my.server.tld") - $stderr.expects(:puts).with('This task only modifies local databases. my-db is on a remote host.') + $stderr.expects(:puts).with("This task only modifies local databases. my-db is on a remote host.") ActiveRecord::Tasks::DatabaseTasks.drop_all end def test_drops_configurations_with_local_ip - @configurations[:development].merge!('host' => '127.0.0.1') + @configurations[:development].merge!("host" => "127.0.0.1") ActiveRecord::Tasks::DatabaseTasks.expects(:drop) @@ -252,7 +252,7 @@ module ActiveRecord end def test_drops_configurations_with_local_host - @configurations[:development].merge!('host' => 'localhost') + @configurations[:development].merge!("host" => "localhost") ActiveRecord::Tasks::DatabaseTasks.expects(:drop) @@ -260,7 +260,7 @@ module ActiveRecord end def test_drops_configurations_with_blank_hosts - @configurations[:development].merge!('host' => nil) + @configurations[:development].merge!("host" => nil) ActiveRecord::Tasks::DatabaseTasks.expects(:drop) @@ -271,9 +271,9 @@ module ActiveRecord class DatabaseTasksDropCurrentTest < ActiveRecord::TestCase def setup @configurations = { - 'development' => {'database' => 'dev-db'}, - 'test' => {'database' => 'test-db'}, - 'production' => {'database' => 'prod-db'} + "development" => {"database" => "dev-db"}, + "test" => {"database" => "test-db"}, + "production" => {"database" => "prod-db"} } ActiveRecord::Base.stubs(:configurations).returns(@configurations) @@ -281,37 +281,37 @@ module ActiveRecord def test_drops_current_environment_database ActiveRecord::Tasks::DatabaseTasks.expects(:drop). - with('database' => 'prod-db') + with("database" => "prod-db") ActiveRecord::Tasks::DatabaseTasks.drop_current( - ActiveSupport::StringInquirer.new('production') + ActiveSupport::StringInquirer.new("production") ) end def test_drops_test_and_development_databases_when_env_was_not_specified ActiveRecord::Tasks::DatabaseTasks.expects(:drop). - with('database' => 'dev-db') + with("database" => "dev-db") ActiveRecord::Tasks::DatabaseTasks.expects(:drop). - with('database' => 'test-db') + with("database" => "test-db") ActiveRecord::Tasks::DatabaseTasks.drop_current( - ActiveSupport::StringInquirer.new('development') + ActiveSupport::StringInquirer.new("development") ) end def test_drops_testand_development_databases_when_rails_env_is_development - old_env = ENV['RAILS_ENV'] - ENV['RAILS_ENV'] = 'development' + old_env = ENV["RAILS_ENV"] + ENV["RAILS_ENV"] = "development" ActiveRecord::Tasks::DatabaseTasks.expects(:drop). - with('database' => 'dev-db') + with("database" => "dev-db") ActiveRecord::Tasks::DatabaseTasks.expects(:drop). - with('database' => 'test-db') + with("database" => "test-db") ActiveRecord::Tasks::DatabaseTasks.drop_current( - ActiveSupport::StringInquirer.new('development') + ActiveSupport::StringInquirer.new("development") ) ensure - ENV['RAILS_ENV'] = old_env + ENV["RAILS_ENV"] = old_env end end @@ -319,7 +319,7 @@ module ActiveRecord self.use_transactional_tests = false def setup - ActiveRecord::Tasks::DatabaseTasks.migrations_paths = 'custom/path' + ActiveRecord::Tasks::DatabaseTasks.migrations_paths = "custom/path" end def teardown @@ -327,15 +327,15 @@ module ActiveRecord end def test_migrate_receives_correct_env_vars - verbose, version = ENV['VERBOSE'], ENV['VERSION'] + verbose, version = ENV["VERBOSE"], ENV["VERSION"] - ENV['VERBOSE'] = 'false' - ENV['VERSION'] = '4' + ENV["VERBOSE"] = "false" + ENV["VERSION"] = "4" - ActiveRecord::Migrator.expects(:migrate).with('custom/path', 4) + ActiveRecord::Migrator.expects(:migrate).with("custom/path", 4) ActiveRecord::Tasks::DatabaseTasks.migrate ensure - ENV['VERBOSE'], ENV['VERSION'] = verbose, version + ENV["VERBOSE"], ENV["VERSION"] = verbose, version end def test_migrate_clears_schema_cache_afterward @@ -350,7 +350,7 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_purge") do eval("@#{v}").expects(:purge) - ActiveRecord::Tasks::DatabaseTasks.purge 'adapter' => k + ActiveRecord::Tasks::DatabaseTasks.purge "adapter" => k end end end @@ -358,27 +358,27 @@ module ActiveRecord class DatabaseTasksPurgeCurrentTest < ActiveRecord::TestCase def test_purges_current_environment_database configurations = { - 'development' => {'database' => 'dev-db'}, - 'test' => {'database' => 'test-db'}, - 'production' => {'database' => 'prod-db'} + "development" => {"database" => "dev-db"}, + "test" => {"database" => "test-db"}, + "production" => {"database" => "prod-db"} } ActiveRecord::Base.stubs(:configurations).returns(configurations) ActiveRecord::Tasks::DatabaseTasks.expects(:purge). - with('database' => 'prod-db') + with("database" => "prod-db") ActiveRecord::Base.expects(:establish_connection).with(:production) - ActiveRecord::Tasks::DatabaseTasks.purge_current('production') + ActiveRecord::Tasks::DatabaseTasks.purge_current("production") end end class DatabaseTasksPurgeAllTest < ActiveRecord::TestCase def test_purge_all_local_configurations - configurations = {:development => {'database' => 'my-db'}} + configurations = {:development => {"database" => "my-db"}} ActiveRecord::Base.stubs(:configurations).returns(configurations) ActiveRecord::Tasks::DatabaseTasks.expects(:purge). - with('database' => 'my-db') + with("database" => "my-db") ActiveRecord::Tasks::DatabaseTasks.purge_all end @@ -390,7 +390,7 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_charset") do eval("@#{v}").expects(:charset) - ActiveRecord::Tasks::DatabaseTasks.charset 'adapter' => k + ActiveRecord::Tasks::DatabaseTasks.charset "adapter" => k end end end @@ -401,7 +401,7 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_collation") do eval("@#{v}").expects(:collation) - ActiveRecord::Tasks::DatabaseTasks.collation 'adapter' => k + ActiveRecord::Tasks::DatabaseTasks.collation "adapter" => k end end end @@ -412,7 +412,7 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_structure_dump") do eval("@#{v}").expects(:structure_dump).with("awesome-file.sql") - ActiveRecord::Tasks::DatabaseTasks.structure_dump({'adapter' => k}, "awesome-file.sql") + ActiveRecord::Tasks::DatabaseTasks.structure_dump({"adapter" => k}, "awesome-file.sql") end end end @@ -423,7 +423,7 @@ module ActiveRecord ADAPTERS_TASKS.each do |k, v| define_method("test_#{k}_structure_load") do eval("@#{v}").expects(:structure_load).with("awesome-file.sql") - ActiveRecord::Tasks::DatabaseTasks.structure_load({'adapter' => k}, "awesome-file.sql") + ActiveRecord::Tasks::DatabaseTasks.structure_load({"adapter" => k}, "awesome-file.sql") end end end @@ -437,15 +437,15 @@ module ActiveRecord class DatabaseTasksCheckSchemaFileDefaultsTest < ActiveRecord::TestCase def test_check_schema_file_defaults - ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns('/tmp') - assert_equal '/tmp/schema.rb', ActiveRecord::Tasks::DatabaseTasks.schema_file + ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns("/tmp") + assert_equal "/tmp/schema.rb", ActiveRecord::Tasks::DatabaseTasks.schema_file end end class DatabaseTasksCheckSchemaFileSpecifiedFormatsTest < ActiveRecord::TestCase - {ruby: 'schema.rb', sql: 'structure.sql'}.each_pair do |fmt, filename| + {ruby: "schema.rb", sql: "structure.sql"}.each_pair do |fmt, filename| define_method("test_check_schema_file_for_#{fmt}_format") do - ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns('/tmp') + ActiveRecord::Tasks::DatabaseTasks.stubs(:db_dir).returns("/tmp") assert_equal "/tmp/#{filename}", ActiveRecord::Tasks::DatabaseTasks.schema_file(fmt) end end diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb index 70e406038f..16ed83b072 100644 --- a/activerecord/test/cases/tasks/mysql_rake_test.rb +++ b/activerecord/test/cases/tasks/mysql_rake_test.rb @@ -1,5 +1,5 @@ -require 'cases/helper' -require 'active_record/tasks/database_tasks' +require "cases/helper" +require "active_record/tasks/database_tasks" if current_adapter?(:Mysql2Adapter) module ActiveRecord @@ -7,8 +7,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'mysql2', - 'database' => 'my-app-db' + "adapter" => "mysql2", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -24,30 +24,30 @@ module ActiveRecord def test_establishes_connection_without_database ActiveRecord::Base.expects(:establish_connection). - with('adapter' => 'mysql2', 'database' => nil) + with("adapter" => "mysql2", "database" => nil) ActiveRecord::Tasks::DatabaseTasks.create @configuration end def test_creates_database_with_no_default_options @connection.expects(:create_database). - with('my-app-db', {}) + with("my-app-db", {}) ActiveRecord::Tasks::DatabaseTasks.create @configuration end def test_creates_database_with_given_encoding @connection.expects(:create_database). - with('my-app-db', charset: 'latin1') + with("my-app-db", charset: "latin1") - ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge('encoding' => 'latin1') + ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge("encoding" => "latin1") end def test_creates_database_with_given_collation @connection.expects(:create_database). - with('my-app-db', collation: 'latin1_swedish_ci') + with("my-app-db", collation: "latin1_swedish_ci") - ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge('collation' => 'latin1_swedish_ci') + ActiveRecord::Tasks::DatabaseTasks.create @configuration.merge("collation" => "latin1_swedish_ci") end def test_establishes_connection_to_database @@ -78,10 +78,10 @@ module ActiveRecord @connection = stub("Connection", create_database: true) @error = Mysql2::Error.new("Invalid permissions") @configuration = { - 'adapter' => 'mysql2', - 'database' => 'my-app-db', - 'username' => 'pat', - 'password' => 'wossname' + "adapter" => "mysql2", + "database" => "my-app-db", + "username" => "pat", + "password" => "wossname" } $stdin.stubs(:gets).returns("secret\n") @@ -110,10 +110,10 @@ module ActiveRecord def test_connection_established_as_root assert_permissions_granted_for("pat") ActiveRecord::Base.expects(:establish_connection).with( - 'adapter' => 'mysql2', - 'database' => nil, - 'username' => 'root', - 'password' => 'secret' + "adapter" => "mysql2", + "database" => nil, + "username" => "root", + "password" => "secret" ) ActiveRecord::Tasks::DatabaseTasks.create @configuration @@ -122,7 +122,7 @@ module ActiveRecord def test_database_created_by_root assert_permissions_granted_for("pat") @connection.expects(:create_database). - with('my-app-db', {}) + with("my-app-db", {}) ActiveRecord::Tasks::DatabaseTasks.create @configuration end @@ -133,8 +133,8 @@ module ActiveRecord end def test_do_not_grant_privileges_for_root_user - @configuration['username'] = 'root' - @configuration['password'] = '' + @configuration["username"] = "root" + @configuration["password"] = "" ActiveRecord::Tasks::DatabaseTasks.create @configuration end @@ -142,10 +142,10 @@ module ActiveRecord assert_permissions_granted_for("pat") ActiveRecord::Base.expects(:establish_connection).returns do ActiveRecord::Base.expects(:establish_connection).with( - 'adapter' => 'mysql2', - 'database' => 'my-app-db', - 'username' => 'pat', - 'password' => 'secret' + "adapter" => "mysql2", + "database" => "my-app-db", + "username" => "pat", + "password" => "secret" ) raise @error @@ -165,8 +165,8 @@ module ActiveRecord private def assert_permissions_granted_for(db_user) - db_name = @configuration['database'] - db_password = @configuration['password'] + db_name = @configuration["database"] + db_password = @configuration["password"] @connection.expects(:execute).with("GRANT ALL PRIVILEGES ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}' WITH GRANT OPTION;") end end @@ -175,8 +175,8 @@ module ActiveRecord def setup @connection = stub(:drop_database => true) @configuration = { - 'adapter' => 'mysql2', - 'database' => 'my-app-db' + "adapter" => "mysql2", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -197,7 +197,7 @@ module ActiveRecord end def test_drops_database - @connection.expects(:drop_database).with('my-app-db') + @connection.expects(:drop_database).with("my-app-db") ActiveRecord::Tasks::DatabaseTasks.drop @configuration end @@ -213,8 +213,8 @@ module ActiveRecord def setup @connection = stub(:recreate_database => true) @configuration = { - 'adapter' => 'mysql2', - 'database' => 'test-db' + "adapter" => "mysql2", + "database" => "test-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -229,17 +229,17 @@ module ActiveRecord def test_recreates_database_with_no_default_options @connection.expects(:recreate_database). - with('test-db', {}) + with("test-db", {}) ActiveRecord::Tasks::DatabaseTasks.purge @configuration end def test_recreates_database_with_the_given_options @connection.expects(:recreate_database). - with('test-db', charset: 'latin', collation: 'latin1_swedish_ci') + with("test-db", charset: "latin", collation: "latin1_swedish_ci") ActiveRecord::Tasks::DatabaseTasks.purge @configuration.merge( - 'encoding' => 'latin', 'collation' => 'latin1_swedish_ci') + "encoding" => "latin", "collation" => "latin1_swedish_ci") end end @@ -247,8 +247,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'mysql2', - 'database' => 'my-app-db' + "adapter" => "mysql2", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -265,8 +265,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'mysql2', - 'database' => 'my-app-db' + "adapter" => "mysql2", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -282,8 +282,8 @@ module ActiveRecord class MySQLStructureDumpTest < ActiveRecord::TestCase def setup @configuration = { - 'adapter' => 'mysql2', - 'database' => 'test-db' + "adapter" => "mysql2", + "database" => "test-db" } end @@ -311,7 +311,7 @@ module ActiveRecord Kernel.expects(:system).with("mysqldump", "--port=10000", "--result-file", filename, "--no-data", "--routines", "--skip-comments", "test-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump( - @configuration.merge('port' => 10000), + @configuration.merge("port" => 10000), filename) end @@ -328,14 +328,14 @@ module ActiveRecord class MySQLStructureLoadTest < ActiveRecord::TestCase def setup @configuration = { - 'adapter' => 'mysql2', - 'database' => 'test-db' + "adapter" => "mysql2", + "database" => "test-db" } end def test_structure_load filename = "awesome-file.sql" - Kernel.expects(:system).with('mysql', '--execute', %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}, "--database", "test-db") + Kernel.expects(:system).with("mysql", "--execute", %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}, "--database", "test-db") .returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb index 99d73e91a4..8c3fc8c6a1 100644 --- a/activerecord/test/cases/tasks/postgresql_rake_test.rb +++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb @@ -1,5 +1,5 @@ -require 'cases/helper' -require 'active_record/tasks/database_tasks' +require "cases/helper" +require "active_record/tasks/database_tasks" if current_adapter?(:PostgreSQLAdapter) module ActiveRecord @@ -7,8 +7,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -24,9 +24,9 @@ module ActiveRecord def test_establishes_connection_to_postgresql_database ActiveRecord::Base.expects(:establish_connection).with( - 'adapter' => 'postgresql', - 'database' => 'postgres', - 'schema_search_path' => 'public' + "adapter" => "postgresql", + "database" => "postgres", + "schema_search_path" => "public" ) ActiveRecord::Tasks::DatabaseTasks.create @configuration @@ -34,25 +34,25 @@ module ActiveRecord def test_creates_database_with_default_encoding @connection.expects(:create_database). - with('my-app-db', @configuration.merge('encoding' => 'utf8')) + with("my-app-db", @configuration.merge("encoding" => "utf8")) ActiveRecord::Tasks::DatabaseTasks.create @configuration end def test_creates_database_with_given_encoding @connection.expects(:create_database). - with('my-app-db', @configuration.merge('encoding' => 'latin')) + with("my-app-db", @configuration.merge("encoding" => "latin")) ActiveRecord::Tasks::DatabaseTasks.create @configuration. - merge('encoding' => 'latin') + merge("encoding" => "latin") end def test_creates_database_with_given_collation_and_ctype @connection.expects(:create_database). - with('my-app-db', @configuration.merge('encoding' => 'utf8', 'collation' => '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('collation' => 'ja_JP.UTF8', 'ctype' => 'ja_JP.UTF8') + merge("collation" => "ja_JP.UTF8", "ctype" => "ja_JP.UTF8") end def test_establishes_connection_to_new_database @@ -92,8 +92,8 @@ module ActiveRecord def setup @connection = stub(:drop_database => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -109,16 +109,16 @@ module ActiveRecord def test_establishes_connection_to_postgresql_database ActiveRecord::Base.expects(:establish_connection).with( - 'adapter' => 'postgresql', - 'database' => 'postgres', - 'schema_search_path' => 'public' + "adapter" => "postgresql", + "database" => "postgres", + "schema_search_path" => "public" ) ActiveRecord::Tasks::DatabaseTasks.drop @configuration end def test_drops_database - @connection.expects(:drop_database).with('my-app-db') + @connection.expects(:drop_database).with("my-app-db") ActiveRecord::Tasks::DatabaseTasks.drop @configuration end @@ -134,8 +134,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true, :drop_database => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -151,23 +151,23 @@ module ActiveRecord def test_establishes_connection_to_postgresql_database ActiveRecord::Base.expects(:establish_connection).with( - 'adapter' => 'postgresql', - 'database' => 'postgres', - 'schema_search_path' => 'public' + "adapter" => "postgresql", + "database" => "postgres", + "schema_search_path" => "public" ) ActiveRecord::Tasks::DatabaseTasks.purge @configuration end def test_drops_database - @connection.expects(:drop_database).with('my-app-db') + @connection.expects(:drop_database).with("my-app-db") ActiveRecord::Tasks::DatabaseTasks.purge @configuration end def test_creates_database @connection.expects(:create_database). - with('my-app-db', @configuration.merge('encoding' => 'utf8')) + with("my-app-db", @configuration.merge("encoding" => "utf8")) ActiveRecord::Tasks::DatabaseTasks.purge @configuration end @@ -183,8 +183,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -201,8 +201,8 @@ module ActiveRecord def setup @connection = stub(:create_database => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -219,8 +219,8 @@ module ActiveRecord def setup @connection = stub(:structure_dump => true) @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } @filename = "awesome-file.sql" @@ -231,23 +231,23 @@ module ActiveRecord end def test_structure_dump - Kernel.expects(:system).with('pg_dump', '-s', '-x', '-O', '-f', @filename, 'my-app-db').returns(true) + Kernel.expects(:system).with("pg_dump", "-s", "-x", "-O", "-f", @filename, "my-app-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename) end def test_structure_dump_with_schema_search_path - @configuration['schema_search_path'] = 'foo,bar' + @configuration["schema_search_path"] = "foo,bar" - Kernel.expects(:system).with('pg_dump', '-s', '-x', '-O', '-f', @filename, '--schema=foo', '--schema=bar', 'my-app-db').returns(true) + Kernel.expects(:system).with("pg_dump", "-s", "-x", "-O", "-f", @filename, "--schema=foo", "--schema=bar", "my-app-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename) end def test_structure_dump_with_schema_search_path_and_dump_schemas_all - @configuration['schema_search_path'] = 'foo,bar' + @configuration["schema_search_path"] = "foo,bar" - Kernel.expects(:system).with("pg_dump", '-s', '-x', '-O', '-f', @filename, 'my-app-db').returns(true) + Kernel.expects(:system).with("pg_dump", "-s", "-x", "-O", "-f", @filename, "my-app-db").returns(true) with_dump_schemas(:all) do ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename) @@ -255,9 +255,9 @@ module ActiveRecord end def test_structure_dump_with_dump_schemas_string - Kernel.expects(:system).with("pg_dump", '-s', '-x', '-O', '-f', @filename, '--schema=foo', '--schema=bar', "my-app-db").returns(true) + Kernel.expects(:system).with("pg_dump", "-s", "-x", "-O", "-f", @filename, "--schema=foo", "--schema=bar", "my-app-db").returns(true) - with_dump_schemas('foo,bar') do + with_dump_schemas("foo,bar") do ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, @filename) end end @@ -277,8 +277,8 @@ module ActiveRecord def setup @connection = stub @configuration = { - 'adapter' => 'postgresql', - 'database' => 'my-app-db' + "adapter" => "postgresql", + "database" => "my-app-db" } ActiveRecord::Base.stubs(:connection).returns(@connection) @@ -288,14 +288,14 @@ module ActiveRecord def test_structure_load filename = "awesome-file.sql" - Kernel.expects(:system).with('psql', '-v', 'ON_ERROR_STOP=1', '-q', '-f', filename, @configuration['database']).returns(true) + Kernel.expects(:system).with("psql", "-v", "ON_ERROR_STOP=1", "-q", "-f", filename, @configuration["database"]).returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) end def test_structure_load_accepts_path_with_spaces filename = "awesome file.sql" - Kernel.expects(:system).with('psql', '-v', 'ON_ERROR_STOP=1', '-q', '-f', filename, @configuration['database']).returns(true) + Kernel.expects(:system).with("psql", "-v", "ON_ERROR_STOP=1", "-q", "-f", filename, @configuration["database"]).returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) end diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb index 4be03c7f61..2477df2c5b 100644 --- a/activerecord/test/cases/tasks/sqlite_rake_test.rb +++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb @@ -1,16 +1,16 @@ -require 'cases/helper' -require 'active_record/tasks/database_tasks' -require 'pathname' +require "cases/helper" +require "active_record/tasks/database_tasks" +require "pathname" if current_adapter?(:SQLite3Adapter) module ActiveRecord class SqliteDBCreateTest < ActiveRecord::TestCase def setup - @database = 'db_create.sqlite3' + @database = "db_create.sqlite3" @connection = stub :connection @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } File.stubs(:exist?).returns(false) @@ -28,11 +28,11 @@ module ActiveRecord def test_db_checks_database_exists File.expects(:exist?).with(@database).returns(false) - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" end def test_when_db_created_successfully_outputs_info_to_stdout - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" assert_equal $stdout.string, "Created database '#{@database}'\n" end @@ -40,7 +40,7 @@ module ActiveRecord def test_db_create_when_file_exists File.stubs(:exist?).returns(true) - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" assert_equal $stderr.string, "Database '#{@database}' already exists\n" end @@ -51,13 +51,13 @@ module ActiveRecord ActiveRecord::Base.expects(:establish_connection).never - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" end def test_db_create_establishes_a_connection ActiveRecord::Base.expects(:establish_connection).with(@configuration) - ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" end def test_db_create_with_error_prints_message @@ -67,21 +67,21 @@ module ActiveRecord $stderr.expects(:puts). with("Couldn't create database for #{@configuration.inspect}") - assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration, '/rails/root' } + assert_raises(Exception) { ActiveRecord::Tasks::DatabaseTasks.create @configuration, "/rails/root" } end end class SqliteDBDropTest < ActiveRecord::TestCase def setup @database = "db_create.sqlite3" - @path = stub(:to_s => '/absolute/path', :absolute? => true) + @path = stub(:to_s => "/absolute/path", :absolute? => true) @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } Pathname.stubs(:new).returns(@path) - File.stubs(:join).returns('/former/relative/path') + File.stubs(:join).returns("/former/relative/path") FileUtils.stubs(:rm).returns(true) $stdout, @original_stdout = StringIO.new, $stdout @@ -95,38 +95,38 @@ module ActiveRecord def test_creates_path_from_database Pathname.expects(:new).with(@database).returns(@path) - ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root" end def test_removes_file_with_absolute_path File.stubs(:exist?).returns(true) @path.stubs(:absolute?).returns(true) - FileUtils.expects(:rm).with('/absolute/path') + FileUtils.expects(:rm).with("/absolute/path") - ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root" end def test_generates_absolute_path_with_given_root @path.stubs(:absolute?).returns(false) - File.expects(:join).with('/rails/root', @path). - returns('/former/relative/path') + File.expects(:join).with("/rails/root", @path). + returns("/former/relative/path") - ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root" end def test_removes_file_with_relative_path File.stubs(:exist?).returns(true) @path.stubs(:absolute?).returns(false) - FileUtils.expects(:rm).with('/former/relative/path') + FileUtils.expects(:rm).with("/former/relative/path") - ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root" end def test_when_db_dropped_successfully_outputs_info_to_stdout - ActiveRecord::Tasks::DatabaseTasks.drop @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root" assert_equal $stdout.string, "Dropped database '#{@database}'\n" end @@ -134,11 +134,11 @@ module ActiveRecord class SqliteDBCharsetTest < ActiveRecord::TestCase def setup - @database = 'db_create.sqlite3' + @database = "db_create.sqlite3" @connection = stub :connection @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } File.stubs(:exist?).returns(false) @@ -148,17 +148,17 @@ module ActiveRecord def test_db_retrieves_charset @connection.expects(:encoding) - ActiveRecord::Tasks::DatabaseTasks.charset @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.charset @configuration, "/rails/root" end end class SqliteDBCollationTest < ActiveRecord::TestCase def setup - @database = 'db_create.sqlite3' + @database = "db_create.sqlite3" @connection = stub :connection @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } File.stubs(:exist?).returns(false) @@ -168,7 +168,7 @@ module ActiveRecord def test_db_retrieves_collation assert_raise NoMethodError do - ActiveRecord::Tasks::DatabaseTasks.collation @configuration, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.collation @configuration, "/rails/root" end end end @@ -177,8 +177,8 @@ module ActiveRecord def setup @database = "db_create.sqlite3" @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } end @@ -186,7 +186,7 @@ module ActiveRecord dbfile = @database filename = "awesome-file.sql" - ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, '/rails/root' + ActiveRecord::Tasks::DatabaseTasks.structure_dump @configuration, filename, "/rails/root" assert File.exist?(dbfile) assert File.exist?(filename) ensure @@ -199,8 +199,8 @@ module ActiveRecord def setup @database = "db_create.sqlite3" @configuration = { - 'adapter' => 'sqlite3', - 'database' => @database + "adapter" => "sqlite3", + "database" => @database } end @@ -208,8 +208,8 @@ module ActiveRecord dbfile = @database filename = "awesome-file.sql" - open(filename, 'w') { |f| f.puts("select datetime('now', 'localtime');") } - ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, '/rails/root' + open(filename, "w") { |f| f.puts("select datetime('now', 'localtime');") } + ActiveRecord::Tasks::DatabaseTasks.structure_load @configuration, filename, "/rails/root" assert File.exist?(dbfile) ensure FileUtils.rm_f(filename) |