Be consistent in testing outputs from railties test and use /bin/rails everywhere(the default behaviour now) instead of mix of /bin/rake /bin/rails everywhere

[Ryo Hashimoto & Vipul A M]

1 files changed, 21 insertions, 21 deletions

diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 1304e73378..c000a70382 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -28,11 +28,11 @@ module ApplicationTests
 
       def db_create_and_drop(expected_database)
         Dir.chdir(app_path) do
-          output = `bin/rake db:create`
+          output = `bin/rails db:create`
           assert_empty output
           assert File.exist?(expected_database)
           assert_equal expected_database, ActiveRecord::Base.connection_config[:database]
-          output = `bin/rake db:drop`
+          output = `bin/rails db:drop`
           assert_empty output
           assert !File.exist?(expected_database)
         end
@@ -52,15 +52,15 @@ module ApplicationTests
       def with_database_existing
         Dir.chdir(app_path) do
           set_database_url
-          `bin/rake db:create`
+          `bin/rails db:create`
           yield
-          `bin/rake db:drop`
+          `bin/rails db:drop`
         end
       end
 
       test 'db:create failure because database exists' do
         with_database_existing do
-          output = `bin/rake db:create 2>&1`
+          output = `bin/rails db:create 2>&1`
           assert_match(/already exists/, output)
           assert_equal 0, $?.exitstatus
         end
@@ -77,7 +77,7 @@ module ApplicationTests
 
       test 'db:create failure because bad permissions' do
         with_bad_permissions do
-          output = `bin/rake db:create 2>&1`
+          output = `bin/rails db:create 2>&1`
           assert_match(/Couldn't create database/, output)
           assert_equal 1, $?.exitstatus
         end
@@ -85,7 +85,7 @@ module ApplicationTests
 
       test 'db:drop failure because database does not exist' do
         Dir.chdir(app_path) do
-          output = `bin/rake db:drop:_unsafe --trace 2>&1`
+          output = `bin/rails db:drop:_unsafe --trace 2>&1`
           assert_match(/does not exist/, output)
           assert_equal 0, $?.exitstatus
         end
@@ -94,7 +94,7 @@ module ApplicationTests
       test 'db:drop failure because bad permissions' do
         with_database_existing do
           with_bad_permissions do
-            output = `bin/rake db:drop 2>&1`
+            output = `bin/rails db:drop 2>&1`
             assert_match(/Couldn't drop/, output)
             assert_equal 1, $?.exitstatus
           end
@@ -104,8 +104,8 @@ module ApplicationTests
       def db_migrate_and_status(expected_database)
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate`
-          output = `bin/rake db:migrate:status`
+           bin/rails db:migrate`
+          output = `bin/rails db:migrate:status`
           assert_match(%r{database:\s+\S*#{Regexp.escape(expected_database)}}, output)
           assert_match(/up\s+\d{14}\s+Create books/, output)
         end
@@ -125,7 +125,7 @@ module ApplicationTests
       def db_schema_dump
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate db:schema:dump`
+           bin/rails db:migrate db:schema:dump`
           schema_dump = File.read("db/schema.rb")
           assert_match(/create_table \"books\"/, schema_dump)
         end
@@ -143,7 +143,7 @@ module ApplicationTests
       def db_fixtures_load(expected_database)
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate db:fixtures:load`
+           bin/rails db:migrate db:fixtures:load`
           assert_match expected_database, ActiveRecord::Base.connection_config[:database]
           require "#{app_path}/app/models/book"
           assert_equal 2, Book.count
@@ -165,7 +165,7 @@ module ApplicationTests
         require "#{app_path}/config/environment"
         Dir.chdir(app_path) do
           `bin/rails generate model admin::book title:string;
-           bin/rake db:migrate db:fixtures:load`
+           bin/rails db:migrate db:fixtures:load`
           require "#{app_path}/app/models/admin/book"
           assert_equal 2, Admin::Book.count
         end
@@ -174,10 +174,10 @@ module ApplicationTests
       def db_structure_dump_and_load(expected_database)
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate db:structure:dump`
+           bin/rails db:migrate db:structure:dump`
           structure_dump = File.read("db/structure.sql")
           assert_match(/CREATE TABLE \"books\"/, structure_dump)
-          `bin/rake environment db:drop db:structure:load`
+          `bin/rails environment db:drop db:structure:load`
           assert_match expected_database, ActiveRecord::Base.connection_config[:database]
           require "#{app_path}/app/models/book"
           #if structure is not loaded correctly, exception would be raised
@@ -201,7 +201,7 @@ module ApplicationTests
           # create table without migrations
           `bin/rails runner 'ActiveRecord::Base.connection.create_table(:posts) {|t| t.string :title }'`
 
-          stderr_output = capture(:stderr) { `bin/rake db:structure:dump` }
+          stderr_output = capture(:stderr) { `bin/rails db:structure:dump` }
           assert_empty stderr_output
           structure_dump = File.read("db/structure.sql")
           assert_match(/CREATE TABLE \"posts\"/, structure_dump)
@@ -221,14 +221,14 @@ module ApplicationTests
           list_tables = lambda { `bin/rails runner 'p ActiveRecord::Base.connection.tables'`.strip }
 
           assert_equal '["posts"]', list_tables[]
-          `bin/rake db:schema:load`
+          `bin/rails db:schema:load`
           assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas"]', list_tables[]
 
           app_file 'db/structure.sql', <<-SQL
             CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255));
           SQL
 
-          `bin/rake db:structure:load`
+          `bin/rails db:structure:load`
           assert_equal '["posts", "comments", "schema_migrations", "active_record_internal_metadatas", "users"]', list_tables[]
         end
       end
@@ -251,7 +251,7 @@ module ApplicationTests
             end
           RUBY
 
-          `bin/rake db:schema:load`
+          `bin/rails db:schema:load`
 
           tables = `bin/rails runner 'p ActiveRecord::Base.connection.tables'`.strip
           assert_match(/"geese"/, tables)
@@ -264,7 +264,7 @@ module ApplicationTests
       def db_test_load_structure
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate db:structure:dump db:test:load_structure`
+           bin/rails db:migrate db:structure:dump db:test:load_structure`
           ActiveRecord::Base.configurations = Rails.application.config.database_configuration
           ActiveRecord::Base.establish_connection :test
           require "#{app_path}/app/models/book"
@@ -300,7 +300,7 @@ module ApplicationTests
           RUBY
 
           Dir.chdir(app_path) do
-            database_path = `bin/rake db:setup`
+            database_path = `bin/rails db:setup`
             assert_equal "development.sqlite3", File.basename(database_path.strip)
           end
         ensure