Merge branch 'master' into adequaterecord

* master: (311 commits)
  Add a missing changelog entry for #13981 and #14035
  Revert "Fixed plugin_generator test"
  implements new option :month_format_string for date select helpers [Closes #13618]
  add factory methods for empty alias trackers
  guarantee a list in the alias tracker so we can remove a conditional
  stop exposing table_joins
  make most parameters to the AliasTracker required
  make a singleton for AssociationScope
  pass the association and connection to the scope method
  pass the tracker down the stack and construct it in the scope method
  clean up add_constraints signature
  remove the reflection delegate
  remove klass delegator
  remove railties changes. fixes #14054
  remove chain delegate
  remove scope_chain delegate
  Add verb to sanitization note
  fix path shown in mailer's templates
  updated Travis build status image url
  fix guide active_support_core_extensions. add Note to String#indent [ci skip]
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency.rb
	activerecord/test/cases/associations/association_scope_test.rb

7 files changed, 202 insertions, 74 deletions

diff --git a/railties/test/app_rails_loader_test.rb b/railties/test/app_rails_loader_test.rb
index 92cb3233d8..1d3b80253a 100644
--- a/railties/test/app_rails_loader_test.rb
+++ b/railties/test/app_rails_loader_test.rb
@@ -22,8 +22,14 @@ class AppRailsLoaderTest < ActiveSupport::TestCase
     exe = "#{script_dir}/rails"
 
     test "is not in a Rails application if #{exe} is not found in the current or parent directories" do
-      File.stubs(:exist?).with('bin/rails').returns(false)
-      File.stubs(:exist?).with('script/rails').returns(false)
+      File.stubs(:file?).with('bin/rails').returns(false)
+      File.stubs(:file?).with('script/rails').returns(false)
+
+      assert !Rails::AppRailsLoader.exec_app_rails
+    end
+
+    test "is not in a Rails application if #{exe} exists but is a folder" do
+      FileUtils.mkdir_p(exe)
 
       assert !Rails::AppRailsLoader.exec_app_rails
     end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 02d8b2c91d..b2d0e7e202 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -336,6 +336,14 @@ module ApplicationTests
       assert_equal 'myamazonsecretaccesskey', app.secrets.aws_secret_access_key
     end
 
+    test "blank config/secrets.yml does not crash the loading process" do
+      app_file 'config/secrets.yml', <<-YAML
+      YAML
+      require "#{app_path}/config/environment"
+
+      assert_nil app.secrets.not_defined
+    end
+
     test "protect from forgery is the default in a new app" do
       make_basic_app
 
@@ -781,5 +789,22 @@ module ApplicationTests
       assert_not Rails.configuration.respond_to?(:method_missing)
       assert Rails.configuration.respond_to?(:method_missing, true)
     end
+
+    test "config.active_record.dump_schema_after_migration is false on production" do
+      build_app
+      ENV["RAILS_ENV"] = "production"
+
+      require "#{app_path}/config/environment"
+
+      assert_not ActiveRecord::Base.dump_schema_after_migration
+    end
+
+    test "config.active_record.dump_schema_after_migration is true by default on development" do
+      ENV["RAILS_ENV"] = "development"
+
+      require "#{app_path}/config/environment"
+
+      assert ActiveRecord::Base.dump_schema_after_migration
+    end
   end
 end
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 33c753868c..b7fd5d02c5 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -153,6 +153,37 @@ module ApplicationTests
            assert_match(/up\s+\d{3,}\s+Add email to users/, output)
         end
       end
+
+      test 'schema generation when dump_schema_after_migration is set' do
+        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`
+
+          assert !File.exist?("db/schema.rb")
+        end
+
+        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`
+
+          structure_dump = File.read("db/schema.rb")
+          assert_match(/create_table "authors"/, structure_dump)
+        end
+      end
+
+      test 'default schema generation after migration' do
+        Dir.chdir(app_path) do
+          `rails generate model book title:string;
+           bundle exec rake db:migrate`
+
+          structure_dump = File.read("db/schema.rb")
+          assert_match(/create_table "books"/, structure_dump)
+        end
+      end
     end
   end
 end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ddecee2ca1..5811379e35 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -163,73 +163,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_arbitrary_code
-    output = Tempfile.open('my_template') do |template|
-      template.puts 'puts "You are using Rails version #{Rails::VERSION::STRING}."'
-      template.close
-      run_generator([destination_root, "-m", template.path])
-    end
-    assert_match 'You are using', output
-  end
-
-  def test_add_gemfile_entry
-    Tempfile.open('my_template') do |template|
-      template.puts 'gemfile_entry "tenderlove"'
-      template.flush
-      template.close
-      run_generator([destination_root, "-n", template.path])
-      assert_file "Gemfile", /tenderlove/
-    end
-  end
-
-  def test_add_skip_entry
-    Tempfile.open 'my_template' do |template|
-      template.puts 'add_gem_entry_filter { |gem| gem.name != "jbuilder" }'
-      template.close
-
-      run_generator([destination_root, "-n", template.path])
-      assert_file "Gemfile" do |contents|
-        assert_no_match 'jbuilder', contents
-      end
-    end
-  end
-
-  def test_remove_gem
-    Tempfile.open 'my_template' do |template|
-      template.puts 'remove_gem "jbuilder"'
-      template.close
-
-      run_generator([destination_root, "-n", template.path])
-      assert_file "Gemfile" do |contents|
-        assert_no_match 'jbuilder', contents
-      end
-    end
-  end
-
-  def test_skip_turbolinks_when_it_is_not_on_gemfile
-    Tempfile.open 'my_template' do |template|
-      template.puts 'add_gem_entry_filter { |gem| gem.name != "turbolinks" }'
-      template.flush
-
-      run_generator([destination_root, "-n", template.path])
-      assert_file "Gemfile" do |contents|
-        assert_no_match 'turbolinks', contents
-      end
-
-      assert_file "app/views/layouts/application.html.erb" do |contents|
-        assert_no_match 'turbolinks', contents
-      end
-
-      assert_file "app/views/layouts/application.html.erb" do |contents|
-        assert_no_match('data-turbolinks-track', contents)
-      end
-
-      assert_file "app/assets/javascripts/application.js" do |contents|
-        assert_no_match 'turbolinks', contents
-      end
-    end
-  end
-
   def test_config_another_database
     run_generator([destination_root, "-d", "mysql"])
     assert_file "config/database.yml", /mysql/
diff --git a/railties/test/generators/create_migration_test.rb b/railties/test/generators/create_migration_test.rb
new file mode 100644
index 0000000000..e16a77479a
--- /dev/null
+++ b/railties/test/generators/create_migration_test.rb
@@ -0,0 +1,134 @@
+require 'generators/generators_test_helper'
+require 'rails/generators/rails/migration/migration_generator'
+
+class CreateMigrationTest < Rails::Generators::TestCase
+  include GeneratorsTestHelper
+
+  class Migrator < Rails::Generators::MigrationGenerator
+    include Rails::Generators::Migration
+
+    def self.next_migration_number(dirname)
+      current_migration_number(dirname) + 1
+    end
+  end
+
+  tests Migrator
+
+  def default_destination_path
+    "db/migrate/create_articles.rb"
+  end
+
+  def create_migration(destination_path = default_destination_path, config = {}, generator_options = {}, &block)
+    migration_name = File.basename(destination_path, '.rb')
+    generator([migration_name], generator_options)
+    generator.set_migration_assigns!(destination_path)
+
+    dir, base = File.split(destination_path)
+    timestamped_destination_path = File.join(dir, ["%migration_number%", base].join('_'))
+
+    @migration = Rails::Generators::Actions::CreateMigration.new(generator, timestamped_destination_path, block || "contents", config)
+  end
+
+  def migration_exists!(*args)
+    @existing_migration = create_migration(*args)
+    invoke!
+    @generator = nil
+  end
+
+  def invoke!
+    capture(:stdout) { @migration.invoke! }
+  end
+
+  def revoke!
+    capture(:stdout) { @migration.revoke! }
+  end
+
+  def test_invoke
+    create_migration
+
+    assert_match(/create  db\/migrate\/1_create_articles.rb\n/, invoke!)
+    assert_file @migration.destination
+  end
+
+  def test_invoke_pretended
+    create_migration(default_destination_path, {}, { pretend: true })
+
+    assert_no_file @migration.destination
+  end
+
+  def test_invoke_when_exists
+    migration_exists!
+    create_migration
+
+    assert_equal @existing_migration.destination, @migration.existing_migration
+  end
+
+  def test_invoke_when_exists_identical
+    migration_exists!
+    create_migration
+
+    assert_match(/identical  db\/migrate\/1_create_articles.rb\n/, invoke!)
+    assert @migration.identical?
+  end
+
+  def test_invoke_when_exists_not_identical
+    migration_exists!
+    create_migration { "different content" }
+
+    assert_raise(Rails::Generators::Error) { invoke! }
+  end
+
+  def test_invoke_forced_when_exists_not_identical
+    dest = "db/migrate/migration.rb"
+    migration_exists!(dest)
+    create_migration(dest, force: true) { "different content" }
+
+    stdout = invoke!
+    assert_match(/remove  db\/migrate\/1_migration.rb\n/, stdout)
+    assert_match(/create  db\/migrate\/2_migration.rb\n/, stdout)
+    assert_file @migration.destination
+    assert_no_file @existing_migration.destination
+  end
+
+  def test_invoke_forced_pretended_when_exists_not_identical
+    migration_exists!
+    create_migration(default_destination_path, { force: true }, { pretend: true }) do
+      "different content"
+    end
+
+    stdout = invoke!
+    assert_match(/remove  db\/migrate\/1_create_articles.rb\n/, stdout)
+    assert_match(/create  db\/migrate\/2_create_articles.rb\n/, stdout)
+    assert_no_file @migration.destination
+  end
+
+  def test_invoke_skipped_when_exists_not_identical
+    migration_exists!
+    create_migration(default_destination_path, {}, { skip: true }) { "different content" }
+
+    assert_match(/skip  db\/migrate\/2_create_articles.rb\n/, invoke!)
+    assert_no_file @migration.destination
+  end
+
+  def test_revoke
+    migration_exists!
+    create_migration
+
+    assert_match(/remove  db\/migrate\/1_create_articles.rb\n/, revoke!)
+    assert_no_file @existing_migration.destination
+  end
+
+  def test_revoke_pretended
+    migration_exists!
+    create_migration(default_destination_path, {}, { pretend: true })
+
+    assert_match(/remove  db\/migrate\/1_create_articles.rb\n/, revoke!)
+    assert_file @existing_migration.destination
+  end
+
+  def test_revoke_when_no_exists
+    create_migration
+
+    assert_match(/remove  db\/migrate\/1_create_articles.rb\n/, revoke!)
+  end
+end
diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb
index 94d2c1bf50..7871399dd7 100644
--- a/railties/test/generators/generator_test.rb
+++ b/railties/test/generators/generator_test.rb
@@ -1,7 +1,6 @@
 require 'active_support/test_case'
 require 'active_support/testing/autorun'
 require 'rails/generators/app_base'
-require 'rails/generators/rails/app/app_generator'
 
 module Rails
   module Generators
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index d209801f60..25649881eb 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -69,12 +69,12 @@ class MailerGeneratorTest < Rails::Generators::TestCase
   def test_invokes_default_text_template_engine
     run_generator
     assert_file "app/views/notifier/foo.text.erb" do |view|
-      assert_match(%r(app/views/notifier/foo\.text\.erb), view)
+      assert_match(%r(\sapp/views/notifier/foo\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
     assert_file "app/views/notifier/bar.text.erb" do |view|
-      assert_match(%r(app/views/notifier/bar\.text\.erb), view)
+      assert_match(%r(\sapp/views/notifier/bar\.text\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
   end
@@ -82,12 +82,12 @@ class MailerGeneratorTest < Rails::Generators::TestCase
   def test_invokes_default_html_template_engine
     run_generator
     assert_file "app/views/notifier/foo.html.erb" do |view|
-      assert_match(%r(app/views/notifier/foo\.html\.erb), view)
+      assert_match(%r(\sapp/views/notifier/foo\.html\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
 
     assert_file "app/views/notifier/bar.html.erb" do |view|
-      assert_match(%r(app/views/notifier/bar\.html\.erb), view)
+      assert_match(%r(\sapp/views/notifier/bar\.html\.erb), view)
       assert_match(/<%= @greeting %>/, view)
     end
   end