tests, railties tests should use `bin/` executables when possible.

We recommend using the `bin/` executables in our docs and guides.
Let's make sure that our tests execute the same code path.

3 files changed, 68 insertions, 68 deletions

diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 5cc9790b28..e7beab8b5e 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 = `bundle exec rake db:create`
+          output = `bin/rake db:create`
           assert_empty output
           assert File.exist?(expected_database)
           assert_equal expected_database, ActiveRecord::Base.connection_config[:database]
-          output = `bundle exec rake db:drop`
+          output = `bin/rake db:drop`
           assert_empty output
           assert !File.exist?(expected_database)
         end
@@ -51,9 +51,9 @@ module ApplicationTests
 
       def db_migrate_and_status(expected_database)
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate`
-          output = `bundle exec rake db:migrate:status`
+          `bin/rails generate model book title:string;
+           bin/rake db:migrate`
+          output = `bin/rake 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
@@ -72,8 +72,8 @@ module ApplicationTests
 
       def db_schema_dump
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           rake db:migrate db:schema:dump`
+          `bin/rails generate model book title:string;
+           bin/rake db:migrate db:schema:dump`
           schema_dump = File.read("db/schema.rb")
           assert_match(/create_table \"books\"/, schema_dump)
         end
@@ -90,8 +90,8 @@ module ApplicationTests
 
       def db_fixtures_load(expected_database)
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate db:fixtures:load`
+          `bin/rails generate model book title:string;
+           bin/rake 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
@@ -112,8 +112,8 @@ module ApplicationTests
       test 'db:fixtures:load with namespaced fixture' do
         require "#{app_path}/config/environment"
         Dir.chdir(app_path) do
-          `rails generate model admin::book title:string;
-           bundle exec rake db:migrate db:fixtures:load`
+          `bin/rails generate model admin::book title:string;
+           bin/rake db:migrate db:fixtures:load`
           require "#{app_path}/app/models/admin/book"
           assert_equal 2, Admin::Book.count
         end
@@ -121,11 +121,11 @@ module ApplicationTests
 
       def db_structure_dump_and_load(expected_database)
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate db:structure:dump`
+          `bin/rails generate model book title:string;
+           bin/rake db:migrate db:structure:dump`
           structure_dump = File.read("db/structure.sql")
           assert_match(/CREATE TABLE \"books\"/, structure_dump)
-          `bundle exec rake environment db:drop db:structure:load`
+          `bin/rake 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
@@ -147,9 +147,9 @@ module ApplicationTests
       test 'db:structure:dump does not dump schema information when no migrations are used' do
         Dir.chdir(app_path) do
           # create table without migrations
-          `bundle exec rails runner 'ActiveRecord::Base.connection.create_table(:posts) {|t| t.string :title }'`
+          `bin/rails runner 'ActiveRecord::Base.connection.create_table(:posts) {|t| t.string :title }'`
 
-          stderr_output = capture(:stderr) { `bundle exec rake db:structure:dump` }
+          stderr_output = capture(:stderr) { `bin/rake db:structure:dump` }
           assert_empty stderr_output
           structure_dump = File.read("db/structure.sql")
           assert_match(/CREATE TABLE \"posts\"/, structure_dump)
@@ -211,8 +211,8 @@ module ApplicationTests
 
       def db_test_load_structure
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate db:structure:dump db:test:load_structure`
+          `bin/rails generate model book title:string;
+           bin/rake 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"
@@ -248,7 +248,7 @@ module ApplicationTests
           RUBY
 
           Dir.chdir(app_path) do
-            database_path = `bundle exec rake db:setup`
+            database_path = `bin/rake 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 a3819b93b2..70e8908a46 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -15,21 +15,21 @@ module ApplicationTests
 
       test 'running migrations with given scope' do
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string`
+          `bin/rails generate model user username:string password:string`
 
           app_file "db/migrate/01_a_migration.bukkits.rb", <<-MIGRATION
             class AMigration < ActiveRecord::Migration
             end
           MIGRATION
 
-          output = `rake db:migrate SCOPE=bukkits`
+          output = `bin/rake 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 = `rake db:migrate SCOPE=bukkits VERSION=0`
+          output = `bin/rake 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)
@@ -40,16 +40,16 @@ module ApplicationTests
 
       test 'model and migration generator with change syntax' do
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string`
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string`
 
-           output = `rake db:migrate`
+           output = `bin/rake 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 = `rake db:rollback STEP=2`
+           output = `bin/rake db:rollback STEP=2`
            assert_match(/drop_table\(:users\)/, output)
            assert_match(/CreateUsers: reverted/, output)
            assert_match(/remove_column\(:users, :email, :string\)/, output)
@@ -58,23 +58,23 @@ module ApplicationTests
       end
 
       test 'migration status when schema migrations table is not present' do
-        output = Dir.chdir(app_path){ `rake db:migrate:status 2>&1` }
+        output = Dir.chdir(app_path){ `bin/rake db:migrate:status 2>&1` }
         assert_equal "Schema migrations table does not exist yet.\n", output
       end
 
       test 'test migration status' do
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string;
-           rake db:migrate`
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string;
+           bin/rake db:migrate`
 
-          output = `rake db:migrate:status`
+          output = `bin/rake 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)
 
-          `rake db:rollback STEP=1`
-          output = `rake db:migrate:status`
+          `bin/rake db:rollback STEP=1`
+          output = `bin/rake 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)
@@ -85,17 +85,17 @@ module ApplicationTests
         add_to_config('config.active_record.timestamped_migrations = false')
 
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string;
-           rake db:migrate`
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string;
+           bin/rake db:migrate`
 
-          output = `rake db:migrate:status`
+          output = `bin/rake 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)
 
-          `rake db:rollback STEP=1`
-          output = `rake db:migrate:status`
+          `bin/rake db:rollback STEP=1`
+          output = `bin/rake 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)
@@ -104,23 +104,23 @@ module ApplicationTests
 
       test 'test migration status after rollback and redo' do
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string;
-           rake db:migrate`
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string;
+           bin/rake db:migrate`
 
-           output = `rake db:migrate:status`
+           output = `bin/rake 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)
 
-           `rake db:rollback STEP=2`
-           output = `rake db:migrate:status`
+           `bin/rake db:rollback STEP=2`
+           output = `bin/rake 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)
 
-           `rake db:migrate:redo`
-           output = `rake db:migrate:status`
+           `bin/rake db:migrate:redo`
+           output = `bin/rake 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)
@@ -131,23 +131,23 @@ module ApplicationTests
         add_to_config('config.active_record.timestamped_migrations = false')
 
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string;
-           rake db:migrate`
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string;
+           bin/rake db:migrate`
 
-           output = `rake db:migrate:status`
+           output = `bin/rake 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)
 
-           `rake db:rollback STEP=2`
-           output = `rake db:migrate:status`
+           `bin/rake db:rollback STEP=2`
+           output = `bin/rake 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)
 
-           `rake db:migrate:redo`
-           output = `rake db:migrate:status`
+           `bin/rake db:migrate:redo`
+           output = `bin/rake 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)
@@ -158,8 +158,8 @@ module ApplicationTests
         add_to_config('config.active_record.dump_schema_after_migration = false')
 
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate`
+          `bin/rails generate model book title:string;
+           bin/rake db:migrate`
 
           assert !File.exist?("db/schema.rb")
         end
@@ -167,8 +167,8 @@ module ApplicationTests
         add_to_config('config.active_record.dump_schema_after_migration = true')
 
         Dir.chdir(app_path) do
-          `rails generate model author name:string;
-           bundle exec rake db:migrate`
+          `bin/rails generate model author name:string;
+           bin/rake db:migrate`
 
           structure_dump = File.read("db/schema.rb")
           assert_match(/create_table "authors"/, structure_dump)
@@ -177,8 +177,8 @@ module ApplicationTests
 
       test 'default schema generation after migration' do
         Dir.chdir(app_path) do
-          `rails generate model book title:string;
-           bundle exec rake db:migrate`
+          `bin/rails generate model book title:string;
+           bin/rake db:migrate`
 
           structure_dump = File.read("db/schema.rb")
           assert_match(/create_table "books"/, structure_dump)
@@ -187,12 +187,12 @@ module ApplicationTests
 
       test 'test migration status migrated file is deleted' do
         Dir.chdir(app_path) do
-          `rails generate model user username:string password:string;
-           rails generate migration add_email_to_users email:string;
-           rake db:migrate
+          `bin/rails generate model user username:string password:string;
+           bin/rails generate migration add_email_to_users email:string;
+           bin/rake db:migrate
            rm db/migrate/*email*.rb`
 
-          output = `rake db:migrate:status`
+          output = `bin/rake 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 95087bf29f..d6f5fee5c3 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' bundle exec rake notes" do |output, lines|
+        run_rake_notes "SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bin/rake 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 "bundle exec rake notes_custom" do |output, lines|
+        run_rake_notes "bin/rake 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)
@@ -127,7 +127,7 @@ module ApplicationTests
 
       private
 
-      def run_rake_notes(command = 'bundle exec rake notes')
+      def run_rake_notes(command = 'bin/rake notes')
         boot_rails
         load_tasks