Merge branch 'master' into stmt

* master: (330 commits)
  plugin new missing license spec
  let Ruby do the is_a check for us
  Mocha 0.14.0 was released with MT5 support. Switch back to gem
  Fix named routing regression from 3.2.13
  Revert "just call the class method since we know the callbacks are stored at the"
  test refactor
  Add more data to AR::UnknownAttributeError
  Raise when multiple included blocks are defined
  Revert "Integration tests support the OPTIONS http method"
  restore whitespace in Gemfile between sqlite3 and sprockets
  Revert "Add the options method to action_controller testcase."
  Check if APP_RAKEFILE is defined
  Fix detection of engine in rake db:load_config Broken by d1d7c86d0c8dcb7e75a87644b330c4e9e7d6c1c1
  Remove trailing line break
  tiny types should only be integers when the length is <= 1. fixes #10620
  add failing test exposing mysql adapter tinyint bug
  require things we need
  Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"
  just call the class method since we know the callbacks are stored at the class level
  this variable is used, so we don't have to use double assignments
  ...

10 files changed, 91 insertions, 33 deletions

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index fa3ab969ae..6703f8df51 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -214,7 +214,7 @@ module ApplicationTests
          bundle exec rake db:migrate db:test:clone test`
       end
 
-      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
@@ -224,7 +224,7 @@ module ApplicationTests
          bundle exec rake db:migrate db:test:clone test`
       end
 
-      assert_match(/7 tests, 13 assertions, 0 failures, 0 errors/, output)
+      assert_match(/7 runs, 13 assertions, 0 failures, 0 errors/, output)
       assert_no_match(/Errors running/, output)
     end
 
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 1cf53aa4fb..118f22995e 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -32,13 +32,13 @@ module ApplicationTests
     def test_run_single_file
       create_test_file :models, 'foo'
       create_test_file :models, 'bar'
-      assert_match "1 tests, 1 assertions, 0 failures", run_test_command("test/models/foo_test.rb")
+      assert_match "1 runs, 1 assertions, 0 failures", run_test_command("test/models/foo_test.rb")
     end
 
     def test_run_multiple_files
       create_test_file :models,  'foo'
       create_test_file :models,  'bar'
-      assert_match "2 tests, 2 assertions, 0 failures", run_test_command("test/models/foo_test.rb test/models/bar_test.rb")
+      assert_match "2 runs, 2 assertions, 0 failures", run_test_command("test/models/foo_test.rb test/models/bar_test.rb")
     end
 
     def test_run_file_with_syntax_error
@@ -59,7 +59,7 @@ module ApplicationTests
       run_test_models_command.tap do |output|
         assert_match "FooTest", output
         assert_match "BarTest", output
-        assert_match "2 tests, 2 assertions, 0 failures", output
+        assert_match "2 runs, 2 assertions, 0 failures", output
       end
     end
 
@@ -70,7 +70,7 @@ module ApplicationTests
       run_test_helpers_command.tap do |output|
         assert_match "FooHelperTest", output
         assert_match "BarHelperTest", output
-        assert_match "2 tests, 2 assertions, 0 failures", output
+        assert_match "2 runs, 2 assertions, 0 failures", output
       end
     end
 
@@ -83,7 +83,7 @@ module ApplicationTests
         assert_match "FooTest", output
         assert_match "BarHelperTest", output
         assert_match "BazUnitTest", output
-        assert_match "3 tests, 3 assertions, 0 failures", output
+        assert_match "3 runs, 3 assertions, 0 failures", output
       end
     end
 
@@ -94,7 +94,7 @@ module ApplicationTests
       run_test_controllers_command.tap do |output|
         assert_match "FooControllerTest", output
         assert_match "BarControllerTest", output
-        assert_match "2 tests, 2 assertions, 0 failures", output
+        assert_match "2 runs, 2 assertions, 0 failures", output
       end
     end
 
@@ -105,7 +105,7 @@ module ApplicationTests
       run_test_mailers_command.tap do |output|
         assert_match "FooMailerTest", output
         assert_match "BarMailerTest", output
-        assert_match "2 tests, 2 assertions, 0 failures", output
+        assert_match "2 runs, 2 assertions, 0 failures", output
       end
     end
 
@@ -118,7 +118,7 @@ module ApplicationTests
         assert_match "FooMailerTest", output
         assert_match "BarControllerTest", output
         assert_match "BazFunctionalTest", output
-        assert_match "3 tests, 3 assertions, 0 failures", output
+        assert_match "3 runs, 3 assertions, 0 failures", output
       end
     end
 
@@ -127,7 +127,7 @@ module ApplicationTests
       create_test_file :models, 'foo'
       run_test_integration_command.tap do |output|
         assert_match "FooIntegration", output
-        assert_match "1 tests, 1 assertions, 0 failures", output
+        assert_match "1 runs, 1 assertions, 0 failures", output
       end
     end
 
@@ -136,7 +136,7 @@ module ApplicationTests
       suites.each { |suite| create_test_file suite, "foo_#{suite}" }
       run_test_command('') .tap do |output|
         suites.each { |suite| assert_match "Foo#{suite.to_s.camelize}Test", output }
-        assert_match "7 tests, 7 assertions, 0 failures", output
+        assert_match "7 runs, 7 assertions, 0 failures", output
       end
     end
 
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index f8fa8ee153..0db40c1d32 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -103,7 +103,7 @@ class ActionsTest < Rails::Generators::TestCase
     run_generator
     autoload_paths = 'config.autoload_paths += %w["#{Rails.root}/app/extras"]'
     action :environment, autoload_paths, env: 'development'
-    assert_file "config/environments/development.rb", /Application\.configure do\n  #{Regexp.escape(autoload_paths)}/
+    assert_file "config/environments/development.rb", /Rails\.application\.configure do\n  #{Regexp.escape(autoload_paths)}/
   end
 
   def test_environment_with_block_should_include_block_contents_in_environment_initializer_block
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5fdf58c8ee..e992534938 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -65,7 +65,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_invalid_application_name_is_fixed
     run_generator [File.join(destination_root, "things-43")]
-    assert_file "things-43/config/environment.rb", /Things43::Application\.initialize!/
+    assert_file "things-43/config/environment.rb", /Rails\.application\.initialize!/
     assert_file "things-43/config/application.rb", /^module Things43$/
   end
 
@@ -111,7 +111,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
                                                                destination_root: app_moved_root, shell: @shell
     generator.send(:app_const)
     quietly { generator.send(:create_config_files) }
-    assert_file "myapp_moved/config/environment.rb", /Myapp::Application\.initialize!/
+    assert_file "myapp_moved/config/environment.rb", /Rails\.application\.initialize!/
     assert_file "myapp_moved/config/initializers/session_store.rb", /_myapp_session/
   end
 
@@ -131,7 +131,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_application_names_are_not_singularized
     run_generator [File.join(destination_root, "hats")]
-    assert_file "hats/config/environment.rb", /Hats::Application\.initialize!/
+    assert_file "hats/config/environment.rb", /Rails\.application\.initialize!/
   end
 
   def test_gemfile_has_no_whitespace_errors
@@ -183,9 +183,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator([destination_root, "-d", "jdbcmysql"])
     assert_file "config/database.yml", /mysql/
     assert_gem "activerecord-jdbcmysql-adapter"
-    # TODO: When the JRuby guys merge jruby-openssl in
-    # jruby this will be removed
-    assert_gem "jruby-openssl" if defined?(JRUBY_VERSION)
   end
 
   def test_config_jdbcsqlite3_database
@@ -260,6 +257,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file 'test'
   end
 
+  def test_creation_of_app_assets_images_directory
+    run_generator
+    assert_file "app/assets/images"
+  end
+
   def test_creation_of_vendor_assets_javascripts_directory
     run_generator
     assert_file "vendor/assets/javascripts"
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index ac71fb5884..32c7612a8f 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -168,14 +168,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     run_generator
     FileUtils.cd destination_root
     quietly { system 'bundle install' }
-    assert_match(/1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
+    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
   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 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
+    assert_match(/1 runs, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`)
   end
 
   def test_ensure_that_migration_tasks_work_with_mountable_option
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 25f299118c..d5ad978986 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -239,13 +239,27 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_file "config/routes.rb", /\.routes\.draw do\s*\|map\|\s*$/
   end
 
-  def test_scaffold_generator_no_assets
+  def test_scaffold_generator_no_assets_with_switch_no_assets
     run_generator [ "posts", "--no-assets" ]
     assert_no_file "app/assets/stylesheets/scaffold.css"
     assert_no_file "app/assets/javascripts/posts.js"
     assert_no_file "app/assets/stylesheets/posts.css"
   end
 
+  def test_scaffold_generator_no_assets_with_switch_assets_false
+    run_generator [ "posts", "--assets=false" ]
+    assert_no_file "app/assets/stylesheets/scaffold.css"
+    assert_no_file "app/assets/javascripts/posts.js"
+    assert_no_file "app/assets/stylesheets/posts.css"
+  end
+
+  def test_scaffold_generator_no_assets_with_switch_resource_route_false
+    run_generator [ "posts", "--resource-route=false" ]
+    assert_file "config/routes.rb" do |route|
+      assert_no_match(/resources :posts$/, route)
+    end
+  end
+
   def test_scaffold_generator_no_stylesheets
     run_generator [ "posts", "--no-stylesheets" ]
     assert_no_file "app/assets/stylesheets/scaffold.css"
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 2724882a23..369a0ee46c 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -77,9 +77,9 @@ module SharedGeneratorTests
   end
 
   def test_template_raises_an_error_with_invalid_path
-    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existant/path"]) }
+    content = capture(:stderr){ run_generator([destination_root, "-m", "non/existent/path"]) }
     assert_match(/The template \[.*\] could not be loaded/, content)
-    assert_match(/non\/existant\/path/, content)
+    assert_match(/non\/existent\/path/, content)
   end
 
   def test_template_is_executed_when_supplied
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 16e259be5d..ed9573453b 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -20,14 +20,6 @@ module InitializableTests
     end
   end
 
-  module Word
-    include Rails::Initializable
-
-    initializer :word do
-      $word = "bird"
-    end
-  end
-
   class Parent
     include Rails::Initializable
 
@@ -235,4 +227,4 @@ module InitializableTests
       assert_equal [1, 2, 3, 4], $arr
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/rails_info_test.rb b/railties/test/rails_info_test.rb
index 5b9088cb64..44a5fd1904 100644
--- a/railties/test/rails_info_test.rb
+++ b/railties/test/rails_info_test.rb
@@ -37,6 +37,11 @@ class InfoTest < ActiveSupport::TestCase
     assert_property 'Goodbye', 'World'
   end
 
+  def test_rails_version
+    assert_property 'Rails version', 
+      File.read(File.realpath('../../../RAILS_VERSION', __FILE__)).chomp
+  end
+
   def test_framework_version
     assert_property 'Active Support version', ActiveSupport.version.to_s
   end
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 80559a6e36..c94937f964 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -13,6 +13,7 @@ module ApplicationTests
 
       @simple_plugin = engine "weblog"
       @plugin = engine "blog"
+      @metrics_plugin = engine "metrics"
 
       app_file 'config/routes.rb', <<-RUBY
         AppTemplate::Application.routes.draw do
@@ -28,6 +29,7 @@ module ApplicationTests
           scope "/:user", :user => "anonymous" do
             mount Blog::Engine => "/blog"
           end
+          mount Metrics::Engine => "/metrics"
           root :to => 'main#index'
         end
       RUBY
@@ -54,6 +56,34 @@ module ApplicationTests
         end
       RUBY
 
+      @metrics_plugin.write "lib/metrics.rb", <<-RUBY
+        module Metrics
+          class Engine < ::Rails::Engine
+            isolate_namespace(Metrics)
+          end
+        end
+      RUBY
+
+      @metrics_plugin.write "config/routes.rb", <<-RUBY
+        Metrics::Engine.routes.draw do
+          get '/generate_blog_route', to: 'generating#generate_blog_route'
+          get '/generate_blog_route_in_view', to: 'generating#generate_blog_route_in_view'
+        end
+      RUBY
+
+      @metrics_plugin.write "app/controllers/metrics/generating_controller.rb", <<-RUBY
+        module Metrics
+          class GeneratingController < ActionController::Base
+            def generate_blog_route
+              render text: blog.post_path(1)
+            end
+
+            def generate_blog_route_in_view
+              render inline: "<%= blog.post_path(1) -%>"
+            end
+          end
+        end
+      RUBY
 
       @plugin.write "app/models/blog/post.rb", <<-RUBY
         module Blog
@@ -201,6 +231,21 @@ module ApplicationTests
       get "/somone/blog/application_route_in_view"
       assert_equal "/", last_response.body
 
+      # test generating engine's route from other engine
+      get "/metrics/generate_blog_route"
+      assert_equal '/anonymous/blog/posts/1', last_response.body
+
+      get "/metrics/generate_blog_route_in_view"
+      assert_equal '/anonymous/blog/posts/1', last_response.body
+
+      # test generating engine's route from other engine with default_url_options
+      get "/metrics/generate_blog_route", {}, 'SCRIPT_NAME' => '/foo'
+      assert_equal '/foo/anonymous/blog/posts/1', last_response.body
+
+      get "/metrics/generate_blog_route_in_view", {}, 'SCRIPT_NAME' => '/foo'
+      assert_equal '/foo/anonymous/blog/posts/1', last_response.body
+
+
       # test generating application's route from engine with default_url_options
       get "/someone/blog/generate_application_route", {}, 'SCRIPT_NAME' => '/foo'
       assert_equal "/foo/", last_response.body