Merge branch 'master' into adequaterecord

* master: (96 commits)
  clarify CHANGELOG [ci skip].
  Fix Generation of proper migration when   ActiveRecord::Base.pluralize_table_names = false.
  update comments to reflect that options support is not available
  synchronize changelogs and 4.1 release notes. [ci skip]
  do not rely on method_missing hitting arel
  use ARel factory methods for building AST nodes
  Fix date_select option overwriting html classes
  - Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore.
  Check if any sqlite files are not included in the gitignore
  Remove sqlite3 lines from .gitignore if the application is not using sqlite3.
  Adding active_model in Rails::Info
  Clean up tables after each test.
  Swapped parameters of assert_equal in assert_select
  Update test helper to use latest Digestor API
  Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work)
  Log the full path, including variant, that the digestor is trying to find
  Fix for digestor to consider variants for partials -- this still needs more testing!!
  fix log_tags request object grammar
  Extract with_example_table into helper method.
  test for structure:dump without schema information table. refs eafec46
  ...

Conflicts:
	activerecord/test/cases/relation/where_chain_test.rb

16 files changed, 227 insertions, 142 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 35b3a379ae..6cf8714177 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,15 @@
+*   Remove sqlite3 lines from `.gitignore` if the application is not using sqlite3.
+
+    *Dmitrii Golub*
+
+*   Add public API to register new extensions for `rake notes`.
+
+    Example:
+
+        config.annotations.register_extensions("scss", "sass") { |tag| /\/\/\s*(#{tag}):?\s*(.*)$/ }
+
+    *Roberto Miranda*
+
 *   Removed unnecessary `rails application` command.
 
     *Arun Agrawal*
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 20e3de32aa..9aec2f9734 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/file_update_checker'
 require 'rails/engine/configuration'
+require 'rails/source_annotation_extractor'
 
 module Rails
   class Application
@@ -149,6 +150,9 @@ module Rails
         end
       end
 
+      def annotations
+        SourceAnnotationExtractor::Annotation
+      end
     end
   end
 end
diff --git a/railties/lib/rails/commands/commands_tasks.rb b/railties/lib/rails/commands/commands_tasks.rb
index f061c2bf74..6cfbc70c51 100644
--- a/railties/lib/rails/commands/commands_tasks.rb
+++ b/railties/lib/rails/commands/commands_tasks.rb
@@ -27,7 +27,7 @@ In addition to those, there are:
 All commands can be run with -h (or --help) for more information.
 EOT
 
-    COMMAND_WHITELIST = %(plugin generate destroy console server dbconsole runner new version help)
+    COMMAND_WHITELIST = %w(plugin generate destroy console server dbconsole runner new version help)
 
     def initialize(argv)
       @argv = argv
diff --git a/railties/lib/rails/generators/actions/create_migration.rb b/railties/lib/rails/generators/actions/create_migration.rb
index 9c3332927f..cf3b7acfff 100644
--- a/railties/lib/rails/generators/actions/create_migration.rb
+++ b/railties/lib/rails/generators/actions/create_migration.rb
@@ -1,4 +1,4 @@
-require 'thor/actions/create_file'
+require 'thor/actions'
 
 module Rails
   module Generators
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index b2ecc22294..dd1438800c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -172,6 +172,10 @@ module Rails
         options[value] ? '# ' : ''
       end
 
+      def sqlite3?
+        !options[:skip_active_record] && options[:database] == 'sqlite3'
+      end
+
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
         def initialize(name, version, comment, options = {}, commented_out = false)
           super
@@ -246,7 +250,7 @@ module Rails
                                     'Use SCSS for stylesheets')
         else
           gems << GemfileEntry.version('sass-rails',
-                                     '~> 4.0.1',
+                                     '~> 4.0.2',
                                      'Use SCSS for stylesheets')
         end
 
diff --git a/railties/lib/rails/generators/generated_attribute.rb b/railties/lib/rails/generators/generated_attribute.rb
index 5e2784c4b0..c5326d70d1 100644
--- a/railties/lib/rails/generators/generated_attribute.rb
+++ b/railties/lib/rails/generators/generated_attribute.rb
@@ -94,6 +94,10 @@ module Rails
         name.sub(/_id$/, '').pluralize
       end
 
+      def singular_name
+        name.sub(/_id$/, '').singularize
+      end
+
       def human_name
         name.humanize
       end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 83cb1dc0d5..abf6909a7f 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -50,7 +50,7 @@ module Rails
     end
 
     def gitignore
-      copy_file "gitignore", ".gitignore"
+      template "gitignore", ".gitignore"
     end
 
     def app
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 6a502e997f..8775e5e235 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -7,10 +7,12 @@
 # Ignore bundler config.
 /.bundle
 
+<% if sqlite3? -%>
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
 
+<% end -%>
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index edadeaca0e..9502876ebb 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -23,7 +23,7 @@ module Rails
       end
 
       def frameworks
-        %w( active_record action_pack action_view action_mailer active_support )
+        %w( active_record action_pack action_view action_mailer active_support active_model )
       end
 
       def framework_version(framework)
diff --git a/railties/lib/rails/source_annotation_extractor.rb b/railties/lib/rails/source_annotation_extractor.rb
index 83e28090f8..201532d299 100644
--- a/railties/lib/rails/source_annotation_extractor.rb
+++ b/railties/lib/rails/source_annotation_extractor.rb
@@ -18,6 +18,20 @@ class SourceAnnotationExtractor
       @@directories ||= %w(app config db lib test) + (ENV['SOURCE_ANNOTATION_DIRECTORIES'] || '').split(',')
     end
 
+    def self.extensions
+      @@extensions ||= {}
+    end
+
+    # Registers new Annotations File Extensions
+    #   SourceAnnotationExtractor::Annotation.register_extensions("css", "scss", "sass", "less", "js") { |tag| /\/\/\s*(#{tag}):?\s*(.*)$/ }
+    def self.register_extensions(*exts, &block)
+      extensions[/\.(#{exts.join("|")})$/] = block
+    end
+
+    register_extensions("builder", "rb", "rake", "yml", "yaml", "ruby") { |tag| /#\s*(#{tag}):?\s*(.*)$/ }
+    register_extensions("css", "js") { |tag| /\/\/\s*(#{tag}):?\s*(.*)$/ }
+    register_extensions("erb") { |tag| /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/ }
+
     # Returns a representation of the annotation that looks like this:
     #
     #   [126] [TODO] This algorithm is simple and clearly correct, make it faster.
@@ -78,21 +92,14 @@ class SourceAnnotationExtractor
       if File.directory?(item)
         results.update(find_in(item))
       else
-        pattern =
-            case item
-            when /\.(builder|rb|coffee|rake)$/
-              /#\s*(#{tag}):?\s*(.*)$/
-            when /\.(css|scss|sass|less|js)$/
-              /\/\/\s*(#{tag}):?\s*(.*)$/
-            when /\.erb$/
-              /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/
-            when /\.haml$/
-              /-\s*#\s*(#{tag}):?\s*(.*)$/
-            when /\.slim$/
-              /\/\s*\s*(#{tag}):?\s*(.*)$/
-            else nil
-            end
-        results.update(extract_annotations_from(item, pattern)) if pattern
+        extension = Annotation.extensions.detect do |regexp, _block|
+          regexp.match(item)
+        end
+
+        if extension
+          pattern = extension.last.call(tag)
+          results.update(extract_annotations_from(item, pattern)) if pattern
+        end
       end
     end
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index b39cd3747b..b11fd55170 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -793,5 +793,15 @@ module ApplicationTests
 
       assert ActiveRecord::Base.dump_schema_after_migration
     end
+
+    test "config.annotations wrapping SourceAnnotationExtractor::Annotation class" do
+      make_basic_app do |app|
+        app.config.annotations.register_extensions("coffee") do |tag|
+          /#\s*(#{tag}):?\s*(.*)$/
+        end
+      end
+
+      assert_not_nil SourceAnnotationExtractor::Annotation.extensions[/\.(coffee)$/]
+    end
   end
 end
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 35d9c31c1e..b2c52a092f 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -26,57 +26,48 @@ module ApplicationTests
         FileUtils.rm_rf("#{app_path}/config/database.yml")
       end
 
-      def expected
-        @expected ||= {}
-      end
-
-      def db_create_and_drop
+      def db_create_and_drop(expected_database)
         Dir.chdir(app_path) do
           output = `bundle exec rake db:create`
-          assert_equal output, ""
-          assert File.exist?(expected[:database])
-          assert_equal expected[:database],
-                        ActiveRecord::Base.connection_config[:database]
+          assert_empty output
+          assert File.exist?(expected_database)
+          assert_equal expected_database, ActiveRecord::Base.connection_config[:database]
           output = `bundle exec rake db:drop`
-          assert_equal output, ""
-          assert !File.exist?(expected[:database])
+          assert_empty output
+          assert !File.exist?(expected_database)
         end
       end
 
       test 'db:create and db:drop without database url' do
         require "#{app_path}/config/environment"
-        expected[:database] = ActiveRecord::Base.configurations[Rails.env]['database']
-        db_create_and_drop
-       end
+        db_create_and_drop ActiveRecord::Base.configurations[Rails.env]['database']
+      end
 
       test 'db:create and db:drop with database url' do
         require "#{app_path}/config/environment"
         set_database_url
-        expected[:database] = database_url_db_name
-        db_create_and_drop
+        db_create_and_drop database_url_db_name
       end
 
-      def db_migrate_and_status
+      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`
-          assert_match(%r{database:\s+\S*#{Regexp.escape(expected[:database])}}, output)
+          assert_match(%r{database:\s+\S*#{Regexp.escape(expected_database)}}, output)
           assert_match(/up\s+\d{14}\s+Create books/, output)
         end
       end
 
       test 'db:migrate and db:migrate:status without database_url' do
         require "#{app_path}/config/environment"
-        expected[:database] = ActiveRecord::Base.configurations[Rails.env]['database']
-        db_migrate_and_status
+        db_migrate_and_status ActiveRecord::Base.configurations[Rails.env]['database']
       end
 
       test 'db:migrate and db:migrate:status with database_url' do
         require "#{app_path}/config/environment"
         set_database_url
-        expected[:database] = database_url_db_name
-        db_migrate_and_status
+        db_migrate_and_status database_url_db_name
       end
 
       def db_schema_dump
@@ -97,12 +88,11 @@ module ApplicationTests
         db_schema_dump
       end
 
-      def db_fixtures_load
+      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`
-          assert_match(/#{expected[:database]}/,
-                    ActiveRecord::Base.connection_config[:database])
+          assert_match expected_database, ActiveRecord::Base.connection_config[:database]
           require "#{app_path}/app/models/book"
           assert_equal 2, Book.count
         end
@@ -110,43 +100,50 @@ module ApplicationTests
 
       test 'db:fixtures:load without database_url' do
         require "#{app_path}/config/environment"
-        expected[:database] =  ActiveRecord::Base.configurations[Rails.env]['database']
-        db_fixtures_load
+        db_fixtures_load ActiveRecord::Base.configurations[Rails.env]['database']
       end
 
       test 'db:fixtures:load with database_url' do
         require "#{app_path}/config/environment"
         set_database_url
-        expected[:database] = database_url_db_name
-        db_fixtures_load
+        db_fixtures_load database_url_db_name
       end
 
-      def db_structure_dump_and_load
+      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`
           structure_dump = File.read("db/structure.sql")
           assert_match(/CREATE TABLE \"books\"/, structure_dump)
           `bundle exec rake environment db:drop db:structure:load`
-          assert_match(/#{expected[:database]}/,
-                        ActiveRecord::Base.connection_config[:database])
+          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
-          assert Book.count, 0
+          assert_equal 0, Book.count
         end
       end
 
       test 'db:structure:dump and db:structure:load without database_url' do
         require "#{app_path}/config/environment"
-        expected[:database] =  ActiveRecord::Base.configurations[Rails.env]['database']
-        db_structure_dump_and_load
+        db_structure_dump_and_load ActiveRecord::Base.configurations[Rails.env]['database']
       end
 
       test 'db:structure:dump and db:structure:load with database_url' do
         require "#{app_path}/config/environment"
         set_database_url
-        expected[:database] = database_url_db_name
-        db_structure_dump_and_load
+        db_structure_dump_and_load database_url_db_name
+      end
+
+      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 }'`
+
+          stderr_output = capture(:stderr) { `bundle exec rake db:structure:dump` }
+          assert_empty stderr_output
+          structure_dump = File.read("db/structure.sql")
+          assert_match(/CREATE TABLE \"posts\"/, structure_dump)
+        end
       end
 
       def db_test_load_structure
@@ -157,9 +154,9 @@ module ApplicationTests
           ActiveRecord::Base.establish_connection :test
           require "#{app_path}/app/models/book"
           #if structure is not loaded correctly, exception would be raised
-          assert Book.count, 0
-          assert_match(/#{ActiveRecord::Base.configurations['test']['database']}/,
-                        ActiveRecord::Base.connection_config[:database])
+          assert_equal 0, Book.count
+          assert_match ActiveRecord::Base.configurations['test']['database'],
+            ActiveRecord::Base.connection_config[:database]
         end
       end
 
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 05f6338b68..95087bf29f 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -1,4 +1,5 @@
 require "isolation/abstract_unit"
+require 'rails/source_annotation_extractor'
 
 module ApplicationTests
   module RakeTests
@@ -18,48 +19,27 @@ module ApplicationTests
 
       test 'notes finds notes for certain file_types' do
         app_file "app/views/home/index.html.erb", "<% # TODO: note in erb %>"
-        app_file "app/views/home/index.html.haml", "-# TODO: note in haml"
-        app_file "app/views/home/index.html.slim", "/ TODO: note in slim"
-        app_file "app/assets/javascripts/application.js.coffee", "# TODO: note in coffee"
         app_file "app/assets/javascripts/application.js", "// TODO: note in js"
         app_file "app/assets/stylesheets/application.css", "// TODO: note in css"
-        app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss"
-        app_file "app/assets/stylesheets/application.css.sass", "// TODO: note in sass"
-        app_file "app/assets/stylesheets/application.css.less", "// TODO: note in less"
         app_file "app/controllers/application_controller.rb", 1000.times.map { "" }.join("\n") << "# TODO: note in ruby"
         app_file "lib/tasks/task.rake", "# TODO: note in rake"
         app_file 'app/views/home/index.html.builder', '# TODO: note in builder'
+        app_file 'config/locales/en.yml', '# TODO: note in yml'
+        app_file 'config/locales/en.yaml', '# TODO: note in yaml'
+        app_file "app/views/home/index.ruby", "# TODO: note in ruby"
 
-        boot_rails
-        require 'rake'
-        require 'rdoc/task'
-        require 'rake/testtask'
-
-        Rails.application.load_tasks
-
-        Dir.chdir(app_path) do
-          output = `bundle exec rake notes`
-          lines = output.scan(/\[([0-9\s]+)\](\s)/)
-
+        run_rake_notes do |output, lines|
           assert_match(/note in erb/, output)
-          assert_match(/note in haml/, output)
-          assert_match(/note in slim/, output)
-          assert_match(/note in ruby/, output)
-          assert_match(/note in coffee/, output)
           assert_match(/note in js/, output)
           assert_match(/note in css/, output)
-          assert_match(/note in scss/, output)
-          assert_match(/note in sass/, output)
-          assert_match(/note in less/, output)
           assert_match(/note in rake/, output)
           assert_match(/note in builder/, output)
+          assert_match(/note in yml/, output)
+          assert_match(/note in yaml/, output)
+          assert_match(/note in ruby/, output)
 
-          assert_equal 12, lines.size
-
-          lines.each do |line|
-            assert_equal 4, line[0].size
-            assert_equal ' ', line[1]
-          end
+          assert_equal 9, lines.size
+          assert_equal [4], lines.map(&:size).uniq
         end
       end
 
@@ -72,18 +52,7 @@ module ApplicationTests
 
         app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
 
-        boot_rails
-
-        require 'rake'
-        require 'rdoc/task'
-        require 'rake/testtask'
-
-        Rails.application.load_tasks
-
-        Dir.chdir(app_path) do
-          output = `bundle exec rake notes`
-          lines = output.scan(/\[([0-9\s]+)\]/).flatten
-
+        run_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)
@@ -92,10 +61,7 @@ module ApplicationTests
           assert_no_match(/note in some_other directory/, output)
 
           assert_equal 5, lines.size
-
-          lines.each do |line_number|
-            assert_equal 4, line_number.size
-          end
+          assert_equal [4], lines.map(&:size).uniq
         end
       end
 
@@ -108,18 +74,7 @@ module ApplicationTests
 
         app_file "some_other_dir/blah.rb", "# TODO: note in some_other directory"
 
-        boot_rails
-
-        require 'rake'
-        require 'rdoc/task'
-        require 'rake/testtask'
-
-        Rails.application.load_tasks
-
-        Dir.chdir(app_path) do
-          output = `SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bundle exec rake notes`
-          lines = output.scan(/\[([0-9\s]+)\]/).flatten
-
+        run_rake_notes "SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bundle exec 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)
@@ -129,10 +84,7 @@ module ApplicationTests
           assert_match(/note in some_other directory/, output)
 
           assert_equal 6, lines.size
-
-          lines.each do |line_number|
-            assert_equal 4, line_number.size
-          end
+          assert_equal [4], lines.map(&:size).uniq
         end
       end
 
@@ -150,32 +102,51 @@ module ApplicationTests
           end
         EOS
 
-        boot_rails
-
-        require 'rake'
-        require 'rdoc/task'
-        require 'rake/testtask'
-
-        Rails.application.load_tasks
-
-        Dir.chdir(app_path) do
-          output = `bundle exec rake notes_custom`
-          lines = output.scan(/\[([0-9\s]+)\]/).flatten
-
+        run_rake_notes "bundle exec 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)
           assert_no_match(/note in app directory/, output)
 
           assert_equal 2, lines.size
+          assert_equal [4], lines.map(&:size).uniq
+        end
+      end
 
-          lines.each do |line_number|
-            assert_equal 4, line_number.size
-          end
+      test 'register a new extension' do
+        add_to_config %q{ config.annotations.register_extensions("scss", "sass") { |annotation| /\/\/\s*(#{annotation}):?\s*(.*)$/ } }
+        app_file "app/assets/stylesheets/application.css.scss", "// TODO: note in scss"
+        app_file "app/assets/stylesheets/application.css.sass", "// TODO: note in sass"
+
+        run_rake_notes do |output, lines|
+          assert_match(/note in scss/, output)
+          assert_match(/note in sass/, output)
+          assert_equal 2, lines.size
         end
       end
 
       private
+
+      def run_rake_notes(command = 'bundle exec rake notes')
+        boot_rails
+        load_tasks
+
+        Dir.chdir(app_path) do
+          output = `#{command}`
+          lines  = output.scan(/\[([0-9\s]+)\]\s/).flatten
+
+          yield output, lines
+        end
+      end
+
+      def load_tasks
+        require 'rake'
+        require 'rdoc/task'
+        require 'rake/testtask'
+
+        Rails.application.load_tasks
+      end
+
       def boot_rails
         super
         require "#{app_path}/config/environment"
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5ebdadacbf..8e1aeddb2b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -408,7 +408,31 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-protected
+  def test_gitignore_when_sqlite3
+    run_generator
+
+    assert_file '.gitignore' do |content|
+      assert_match(/sqlite3/, content)
+    end
+  end
+
+  def test_gitignore_when_no_active_record
+    run_generator [destination_root, '--skip-active-record']
+
+    assert_file '.gitignore' do |content|
+      assert_no_match(/sqlite/i, content)
+    end
+  end
+
+  def test_gitignore_when_non_sqlite3_db
+    run_generator([destination_root, "-d", "mysql"])
+
+    assert_file '.gitignore' do |content|
+      assert_no_match(/sqlite/i, content)
+    end
+  end
+
+  protected
 
   def action(*args, &block)
     silence(:stdout) { generator.send(*args, &block) }
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index d876597944..6fac643ed0 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -197,4 +197,54 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
   def test_properly_identifies_usage_file
     assert generator_class.send(:usage_path)
   end
+
+  def test_migration_with_singular_table_name
+    with_singular_table_name do
+      migration = "add_title_body_to_post"
+      run_generator [migration, 'title:string']
+      assert_migration "db/migrate/#{migration}.rb" do |content|
+        assert_method :change, content do |change|
+          assert_match(/add_column :post, :title, :string/, change)
+        end
+      end
+    end
+  end
+
+  def test_create_join_table_migration_with_singular_table_name
+    with_singular_table_name do
+      migration = "add_media_join_table"
+      run_generator [migration, "artist_id", "music:uniq"]
+
+      assert_migration "db/migrate/#{migration}.rb" do |content|
+        assert_method :change, content do |change|
+          assert_match(/create_join_table :artist, :music/, change)
+          assert_match(/# t.index \[:artist_id, :music_id\]/, change)
+          assert_match(/  t.index \[:music_id, :artist_id\], unique: true/, change)
+        end
+      end
+    end
+  end
+
+  def test_create_table_migration_with_singular_table_name
+    with_singular_table_name do
+      run_generator ["create_book", "title:string", "content:text"]
+      assert_migration "db/migrate/create_book.rb" do |content|
+        assert_method :change, content do |change|
+          assert_match(/create_table :book/, change)
+          assert_match(/  t\.string :title/, change)
+          assert_match(/  t\.text :content/, change)
+        end
+      end
+    end
+  end
+
+  private
+
+    def with_singular_table_name
+      old_state = ActiveRecord::Base.pluralize_table_names
+      ActiveRecord::Base.pluralize_table_names = false
+      yield
+    ensure
+      ActiveRecord::Base.pluralize_table_names = old_state
+    end
 end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index b2fc3a2a4f..7ebc015fe2 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -185,22 +185,22 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     run_generator
     FileUtils.cd destination_root
     quietly { system 'bundle install' }
-    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
+    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
   end
 
   def test_ensure_that_tests_works_in_full_mode
     run_generator [destination_root, "--full", "--skip_active_record"]
     FileUtils.cd destination_root
     quietly { system 'bundle install' }
-    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
+    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test 2>&1`)
   end
 
   def test_ensure_that_migration_tasks_work_with_mountable_option
     run_generator [destination_root, "--mountable"]
     FileUtils.cd destination_root
     quietly { system 'bundle install' }
-    `bundle exec rake db:migrate`
-    assert_equal 0, $?.exitstatus
+    output = `bundle exec rake db:migrate 2>&1`
+    assert $?.success?, "Command failed: #{output}"
   end
 
   def test_creating_engine_in_full_mode