Merge remote-tracking branch 'upstream/master'

1 files changed, 38 insertions, 16 deletions

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index fb7ebaa1fa..235c08e38e 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -55,6 +55,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/
     assert_file "app/assets/stylesheets/application.css"
     assert_file "config/application.rb", /config\.assets\.enabled = true/
+    assert_file "public/index.html", /url\("assets\/rails.png"\);/
   end
 
   def test_invalid_application_name_raises_an_error
@@ -143,6 +144,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/
@@ -189,7 +200,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test/performance/browsing_test.rb"
   end
 
-  def test_generator_if_skip_active_record_is_given
+  def test_generator_if_skip_sprockets_is_given
     run_generator [destination_root, "--skip-sprockets"]
     assert_file "config/application.rb" do |content|
       assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
@@ -198,11 +209,28 @@ 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'
   end
 
+  def test_creation_of_vendor_assets_javascripts_directory
+    run_generator
+    assert_file "vendor/assets/javascripts"
+  end
+
+  def test_creation_of_vendor_assets_stylesheets_directory
+    run_generator
+    assert_file "vendor/assets/stylesheets"
+  end
+
   def test_jquery_is_the_default_javascript_library
     run_generator
     assert_file "app/assets/javascripts/application.js" do |contents|
@@ -232,21 +260,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|
@@ -314,6 +327,15 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_generated_environments_file_for_sanitizer
+    run_generator [destination_root, "--skip-active-record"]
+    ["config/environments/development.rb", "config/environments/test.rb"].each do |env_file|
+      assert_file env_file do |file|
+        assert_no_match(/config.active_record.mass_assignment_sanitizer = :strict/, file)
+      end
+    end
+  end
+
 protected
 
   def action(*args, &block)