Merge branch 'master' into serializers

13 files changed, 94 insertions, 27 deletions

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 97ad47ac14..f356805d6e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -476,7 +476,7 @@ module ApplicationTests
 
       app_file 'app/controllers/posts_controller.rb', <<-RUBY
       class PostsController < ApplicationController
-        def index
+        def create
           render :text => params[:post].inspect
         end
       end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 1528d5dd87..2073c780bf 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -18,16 +18,20 @@ class ConsoleTest < Test::Unit::TestCase
     Rails.application.load_console
   end
 
+  def irb_context
+    Object.new.extend(Rails::ConsoleMethods)
+  end
+
   def test_app_method_should_return_integration_session
     TestHelpers::Rack.send :remove_method, :app
     load_environment
-    console_session = app
+    console_session = irb_context.app
     assert_instance_of ActionDispatch::Integration::Session, console_session
   end
 
   def test_new_session_should_return_integration_session
     load_environment
-    session = new_session
+    session = irb_context.new_session
     assert_instance_of ActionDispatch::Integration::Session, session
   end
 
@@ -41,7 +45,7 @@ class ConsoleTest < Test::Unit::TestCase
     ActionDispatch::Reloader.to_prepare { c = 3 }
 
     # Hide Reloading... output
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
 
     assert_equal 1, a
     assert_equal 2, b
@@ -66,12 +70,13 @@ class ConsoleTest < Test::Unit::TestCase
     MODEL
 
     assert !User.new.respond_to?(:age)
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
     assert User.new.respond_to?(:age)
   end
 
   def test_access_to_helpers
     load_environment
+    helper = irb_context.helper
     assert_not_nil helper
     assert_instance_of ActionView::Base, helper
     assert_equal 'Once upon a time in a world...',
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 093cb6ca2a..4703a59326 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -30,6 +30,7 @@ module ApplicationTests
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rack::MethodOverride",
+        "ActionDispatch::RequestId",
         "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::RemoteIp",
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 8b2b2f1802..387eb25525 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -12,6 +12,8 @@ module ApplicationTests
         build_app
         require "#{app_path}/config/environment"
         super
+        @logger = MockLogger.new
+        Rails.stubs(:logger).returns(@logger)
       end
 
       def teardown
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index ff9cdcadc7..86e1995def 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -6,7 +6,7 @@ module ApplicationTests
 
     def rackup
       require "rack"
-      app, options = Rack::Builder.parse_file("#{app_path}/config.ru")
+      app, _ = Rack::Builder.parse_file("#{app_path}/config.ru")
       app
     end
 
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index add8256b5d..78980705ed 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -49,12 +49,20 @@ module ApplicationTests
       assert_equal ["root  / pages#main"], output
     end
 
+    def test_inspect_routes_shows_dynamic_action_route
+      @set.draw do
+        match 'api/:action' => 'api'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /api/:action(.:format) api#:action"], output
+    end
+
     def test_inspect_routes_shows_controller_and_action_only_route
       @set.draw do
         match ':controller/:action'
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) "], output
+      assert_equal ["  /:controller/:action(.:format) :controller#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_route_with_constraints
@@ -62,7 +70,7 @@ module ApplicationTests
         match ':controller(/:action(/:id))', :id => /\d+/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}"], output
+      assert_equal ["  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
     end
 
     def test_rake_routes_shows_route_with_defaults
diff --git a/railties/test/fixtures/lib/generators/usage_template/USAGE b/railties/test/fixtures/lib/generators/usage_template/USAGE
new file mode 100644
index 0000000000..bcd63c52e2
--- /dev/null
+++ b/railties/test/fixtures/lib/generators/usage_template/USAGE
@@ -0,0 +1 @@
+:: <%= 1 + 1 %> ::
\ No newline at end of file
diff --git a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
new file mode 100644
index 0000000000..078b0f9412
--- /dev/null
+++ b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
@@ -0,0 +1,5 @@
+require 'rails/generators'
+
+class UsageTemplateGenerator < Rails::Generators::Base
+  source_root File.expand_path("templates", File.dirname(__FILE__))
+end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 133efb872f..a1bd2fbaa5 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -143,6 +143,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_config_postgresql_database
+    run_generator([destination_root, "-d", "postgresql"])
+    assert_file "config/database.yml", /postgresql/
+    unless defined?(JRUBY_VERSION)
+      assert_file "Gemfile", /^gem\s+["']pg["']$/
+    else
+      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcpostgresql-adapter["']$/
+    end
+  end
+
   def test_config_jdbcmysql_database
     run_generator([destination_root, "-d", "jdbcmysql"])
     assert_file "config/database.yml", /mysql/
@@ -198,6 +208,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test/performance/browsing_test.rb"
   end
 
+  def test_inclusion_of_therubyrhino_under_jruby
+    if defined?(JRUBY_VERSION)
+      run_generator([destination_root])
+      assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
+    end
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'
@@ -242,21 +259,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_turn_gem_in_gemfile
-    run_generator
-    assert_file "Gemfile" do |contents|
-      assert_match(/gem 'turn'/, contents) unless RUBY_VERSION < '1.9.2'
-      assert_no_match(/gem 'turn'/, contents) if RUBY_VERSION < '1.9.2'
-    end
-  end
-
-  def test_turn_gem_is_not_included_in_gemfile_if_skipping_test_unit
-    run_generator [destination_root, "--skip-test-unit"]
-    assert_file "Gemfile" do |contents|
-      assert_no_match(/gem 'turn'/, contents) unless RUBY_VERSION < '1.9.2'
-    end
-  end
-
   def test_inclusion_of_ruby_debug
     run_generator
     assert_file "Gemfile" do |contents|
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 9183945619..826eac904e 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -37,6 +37,12 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "things-43/lib/things-43.rb", /module Things43/
   end
 
+  def test_camelcase_plugin_name_underscores_filenames
+    run_generator [File.join(destination_root, "CamelCasedName")]
+    assert_no_file "CamelCasedName/lib/CamelCasedName.rb"
+    assert_file "CamelCasedName/lib/camel_cased_name.rb", /module CamelCasedName/
+  end
+
   def test_generating_without_options
     run_generator
     assert_file "README.rdoc", /Bukkits/
@@ -236,6 +242,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "spec/dummy/config/application.rb"
     assert_no_file "test"
   end
+  
+  def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
+    FileUtils.cd(Rails.root)
+    run_generator([destination_root, "--dummy_path", "spec/dummy" "--skip-test-unit"])
+    assert_file ".gitignore" do |contents|
+      assert_match(/spec\/dummy/, contents)
+    end
+  end
 
   def test_skipping_test_unit
     run_generator [destination_root, "--skip-test-unit"]
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 56329f3183..5f9ee220dc 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -201,4 +201,10 @@ class GeneratorsTest < Rails::Generators::TestCase
     mspec = Rails::Generators.find_by_namespace :fixjour
     assert mspec.source_paths.include?(File.join(Rails.root, "lib", "templates", "fixjour"))
   end
+  
+  def test_usage_with_embedded_ruby
+    require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__))
+    output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] }
+    assert_match /:: 2 ::/, output
+  end
 end
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 06a60cd858..e8081c977f 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -323,7 +323,7 @@ module RailtiesTest
 
       assert_equal "bukkits_", Bukkits.table_name_prefix
       assert_equal "bukkits", Bukkits::Engine.engine_name
-      assert_equal Bukkits._railtie, Bukkits::Engine
+      assert_equal Bukkits.railtie_namespace, Bukkits::Engine
       assert ::Bukkits::MyMailer.method_defined?(:foo_path)
       assert !::Bukkits::MyMailer.method_defined?(:bar_path)
 
@@ -455,13 +455,19 @@ module RailtiesTest
 
       Rails.application.load_seed
       assert Rails.application.config.app_seeds_loaded
-      assert_raise(NoMethodError) do  Bukkits::Engine.config.bukkits_seeds_loaded end
+      assert_raise(NoMethodError) { Bukkits::Engine.config.bukkits_seeds_loaded }
 
       Bukkits::Engine.load_seed
       assert Bukkits::Engine.config.bukkits_seeds_loaded
     end
 
-    test "using namespace more than once on one module should not overwrite _railtie method" do
+    test "skips nonexistent seed data" do
+      FileUtils.rm "#{app_path}/db/seeds.rb"
+      boot_rails
+      assert_nil Rails.application.load_seed
+    end
+
+    test "using namespace more than once on one module should not overwrite railtie_namespace method" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module AppTemplate
           class Engine < ::Rails::Engine
@@ -478,7 +484,7 @@ module RailtiesTest
 
       boot_rails
 
-      assert_equal AppTemplate._railtie, AppTemplate::Engine
+      assert_equal AppTemplate.railtie_namespace, AppTemplate::Engine
     end
 
     test "properly reload routes" do
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 21fde49ff7..7653e52d26 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -21,6 +21,23 @@ module RailtiesTest
       assert_match "alert()", last_response.body
     end
 
+    def test_rake_environment_can_be_called_in_the_engine_or_plugin
+      boot_rails
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+        task :foo => :environment do
+          puts "Task ran"
+        end
+      RUBY
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake foo`
+        assert_match "Task ran", output
+      end
+    end
+
     def test_copying_migrations
       @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
         class CreateUsers < ActiveRecord::Migration