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]

3 files changed, 56 insertions, 56 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
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 580ed269cb..7e2519ae5a 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -22,14 +22,14 @@ module ApplicationTests
             end
           MIGRATION
 
-          output = `bin/rake db:migrate SCOPE=bukkits`
+          output = `bin/rails db:migrate SCOPE=bukkits`
           assert_no_match(/create_table\(:users\)/, output)
           assert_no_match(/CreateUsers/, output)
           assert_no_match(/add_column\(:users, :email, :string\)/, output)
 
           assert_match(/AMigration: migrated/, output)
 
-          output = `bin/rake db:migrate SCOPE=bukkits VERSION=0`
+          output = `bin/rails db:migrate SCOPE=bukkits VERSION=0`
           assert_no_match(/drop_table\(:users\)/, output)
           assert_no_match(/CreateUsers/, output)
           assert_no_match(/remove_column\(:users, :email\)/, output)
@@ -43,13 +43,13 @@ module ApplicationTests
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string`
 
-           output = `bin/rake db:migrate`
+           output = `bin/rails db:migrate`
            assert_match(/create_table\(:users\)/, output)
            assert_match(/CreateUsers: migrated/, output)
            assert_match(/add_column\(:users, :email, :string\)/, output)
            assert_match(/AddEmailToUsers: migrated/, output)
 
-           output = `bin/rake db:rollback STEP=2`
+           output = `bin/rails db:rollback STEP=2`
            assert_match(/drop_table\(:users\)/, output)
            assert_match(/CreateUsers: reverted/, output)
            assert_match(/remove_column\(:users, :email, :string\)/, output)
@@ -58,7 +58,7 @@ module ApplicationTests
       end
 
       test 'migration status when schema migrations table is not present' do
-        output = Dir.chdir(app_path){ `bin/rake db:migrate:status 2>&1` }
+        output = Dir.chdir(app_path){ `bin/rails db:migrate:status 2>&1` }
         assert_equal "Schema migrations table does not exist yet.\n", output
       end
 
@@ -66,15 +66,15 @@ module ApplicationTests
         Dir.chdir(app_path) do
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string;
-           bin/rake db:migrate`
+           bin/rails db:migrate`
 
-          output = `bin/rake db:migrate:status`
+          output = `bin/rails db:migrate:status`
 
           assert_match(/up\s+\d{14}\s+Create users/, output)
           assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-          `bin/rake db:rollback STEP=1`
-          output = `bin/rake db:migrate:status`
+          `bin/rails db:rollback STEP=1`
+          output = `bin/rails db:migrate:status`
 
           assert_match(/up\s+\d{14}\s+Create users/, output)
           assert_match(/down\s+\d{14}\s+Add email to users/, output)
@@ -87,15 +87,15 @@ module ApplicationTests
         Dir.chdir(app_path) do
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string;
-           bin/rake db:migrate`
+           bin/rails db:migrate`
 
-          output = `bin/rake db:migrate:status`
+          output = `bin/rails db:migrate:status`
 
           assert_match(/up\s+\d{3,}\s+Create users/, output)
           assert_match(/up\s+\d{3,}\s+Add email to users/, output)
 
-          `bin/rake db:rollback STEP=1`
-          output = `bin/rake db:migrate:status`
+          `bin/rails db:rollback STEP=1`
+          output = `bin/rails db:migrate:status`
 
           assert_match(/up\s+\d{3,}\s+Create users/, output)
           assert_match(/down\s+\d{3,}\s+Add email to users/, output)
@@ -106,21 +106,21 @@ module ApplicationTests
         Dir.chdir(app_path) do
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string;
-           bin/rake db:migrate`
+           bin/rails db:migrate`
 
-           output = `bin/rake db:migrate:status`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/up\s+\d{14}\s+Create users/, output)
            assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-           `bin/rake db:rollback STEP=2`
-           output = `bin/rake db:migrate:status`
+           `bin/rails db:rollback STEP=2`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/down\s+\d{14}\s+Create users/, output)
            assert_match(/down\s+\d{14}\s+Add email to users/, output)
 
-           `bin/rake db:migrate:redo`
-           output = `bin/rake db:migrate:status`
+           `bin/rails db:migrate:redo`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/up\s+\d{14}\s+Create users/, output)
            assert_match(/up\s+\d{14}\s+Add email to users/, output)
@@ -133,21 +133,21 @@ module ApplicationTests
         Dir.chdir(app_path) do
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string;
-           bin/rake db:migrate`
+           bin/rails db:migrate`
 
-           output = `bin/rake db:migrate:status`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/up\s+\d{3,}\s+Create users/, output)
            assert_match(/up\s+\d{3,}\s+Add email to users/, output)
 
-           `bin/rake db:rollback STEP=2`
-           output = `bin/rake db:migrate:status`
+           `bin/rails db:rollback STEP=2`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/down\s+\d{3,}\s+Create users/, output)
            assert_match(/down\s+\d{3,}\s+Add email to users/, output)
 
-           `bin/rake db:migrate:redo`
-           output = `bin/rake db:migrate:status`
+           `bin/rails db:migrate:redo`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/up\s+\d{3,}\s+Create users/, output)
            assert_match(/up\s+\d{3,}\s+Add email to users/, output)
@@ -167,9 +167,9 @@ module ApplicationTests
             end
           MIGRATION
 
-          `bin/rake db:migrate`
+          `bin/rails db:migrate`
 
-           output = `bin/rake db:migrate:status`
+           output = `bin/rails db:migrate:status`
 
            assert_match(/up\s+001\s+One migration/, output)
            assert_match(/up\s+002\s+Two migration/, output)
@@ -184,7 +184,7 @@ module ApplicationTests
           output = `bin/rails generate model author name:string`
           version = output =~ %r{[^/]+db/migrate/(\d+)_create_authors\.rb} && $1
 
-          `bin/rake db:migrate db:rollback db:forward db:migrate:up db:migrate:down VERSION=#{version}`
+          `bin/rails db:migrate db:rollback db:forward db:migrate:up db:migrate:down VERSION=#{version}`
           assert !File.exist?("db/schema.rb"), "should not dump schema when configured not to"
         end
 
@@ -192,7 +192,7 @@ module ApplicationTests
 
         Dir.chdir(app_path) do
           `bin/rails generate model reviews book_id:integer`
-          `bin/rake db:migrate`
+          `bin/rails db:migrate`
 
           structure_dump = File.read("db/schema.rb")
           assert_match(/create_table "reviews"/, structure_dump)
@@ -202,7 +202,7 @@ module ApplicationTests
       test 'default schema generation after migration' do
         Dir.chdir(app_path) do
           `bin/rails generate model book title:string;
-           bin/rake db:migrate`
+           bin/rails db:migrate`
 
           structure_dump = File.read("db/schema.rb")
           assert_match(/create_table "books"/, structure_dump)
@@ -213,10 +213,10 @@ module ApplicationTests
         Dir.chdir(app_path) do
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string;
-           bin/rake db:migrate
+           bin/rails db:migrate
            rm db/migrate/*email*.rb`
 
-          output = `bin/rake db:migrate:status`
+          output = `bin/rails db:migrate:status`
           File.write('test.txt', output)
 
           assert_match(/up\s+\d{14}\s+Create users/, output)
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index c87515f00f..50def9beb0 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -74,7 +74,7 @@ module ApplicationTests
 
         app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
 
-        run_rake_notes "SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bin/rake notes" do |output, lines|
+        run_rake_notes "SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bin/rails notes" do |output, lines|
           assert_match(/note in app directory/, output)
           assert_match(/note in config directory/, output)
           assert_match(/note in db directory/, output)
@@ -102,7 +102,7 @@ module ApplicationTests
           end
         EOS
 
-        run_rake_notes "bin/rake notes_custom" do |output, lines|
+        run_rake_notes "bin/rails notes_custom" do |output, lines|
           assert_match(/\[FIXME\] note in lib directory/, output)
           assert_match(/\[TODO\] note in test directory/, output)
           assert_no_match(/OPTIMIZE/, output)
@@ -128,7 +128,7 @@ module ApplicationTests
 
       private
 
-      def run_rake_notes(command = 'bin/rake notes')
+      def run_rake_notes(command = 'bin/rails notes')
         boot_rails
         load_tasks