4 files changed, 48 insertions, 24 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 43a985615f..6f03cf3083 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -29,6 +29,7 @@ DEFAULT_APP_FILES = %w(
   lib/tasks
   lib/assets
   log
+  test/test_helper.rb
   test/fixtures
   test/controllers
   test/models
@@ -37,6 +38,8 @@ DEFAULT_APP_FILES = %w(
   test/integration
   vendor
   vendor/assets
+  vendor/assets/stylesheets
+  vendor/assets/javascripts
   tmp/cache
   tmp/cache/assets
 )
@@ -58,6 +61,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/)
     assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+"application", "data-turbolinks-track" => true/)
     assert_file("app/assets/stylesheets/application.css")
+    assert_file("app/assets/javascripts/application.js")
   end
 
   def test_invalid_application_name_raises_an_error
@@ -182,7 +186,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     template.unlink
   end
 
-  def test_application_html_checks_gems
+  def test_skip_turbolinks_when_it_is_not_on_gemfile
     template = Tempfile.open 'my_template'
     template.puts 'add_gem_entry_filter { |gem| gem.name != "turbolinks" }'
     template.flush
@@ -191,10 +195,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match 'turbolinks', contents
     end
-    assert_file "Gemfile" do |contents|
+
+    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
   ensure
@@ -305,24 +315,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_creation_of_a_test_directory
-    run_generator
-    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"
-  end
-
-  def test_creation_of_vendor_assets_stylesheets_directory
-    run_generator
-    assert_file "vendor/assets/stylesheets"
+  def test_inclusion_of_plateform_dependent_gems
+    run_generator([destination_root])
+    if RUBY_ENGINE == 'rbx'
+      assert_gem 'rubysl'
+    end
   end
 
   def test_jquery_is_the_default_javascript_library
@@ -331,7 +328,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
       assert_match %r{^//= require jquery}, contents
       assert_match %r{^//= require jquery_ujs}, contents
     end
-    assert_file "Gemfile", /^gem 'jquery-rails'/
+    assert_gem "jquery-rails"
   end
 
   def test_other_javascript_libraries
@@ -356,6 +353,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     assert_file "Gemfile" do |content|
       assert_no_match(/coffee-rails/, content)
+      assert_no_match(/jquery-rails/, content)
     end
   end
 
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index 9c664a903a..2268f04839 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -43,6 +43,12 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
     assert_file "app/assets/stylesheets/account.css"
   end
 
+  def test_does_not_invoke_assets_if_required
+    run_generator ["account", "--skip-assets"]
+    assert_no_file "app/assets/javascripts/account.js"
+    assert_no_file "app/assets/stylesheets/account.css"
+  end
+
   def test_invokes_default_test_framework
     run_generator
     assert_file "test/controllers/account_controller_test.rb"
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 068eb66bc6..c6b91e7cba 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -293,7 +293,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
       assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
-      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_match_sqlite3(contents)
       assert_no_match(/# gem "jquery-rails"/, contents)
     end
   end
@@ -304,7 +304,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |contents|
       assert_no_match('gemspec', contents)
       assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
-      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+      assert_match_sqlite3(contents)
     end
   end
 
@@ -347,4 +347,12 @@ protected
   def default_files
     ::DEFAULT_PLUGIN_FILES
   end
+
+  def assert_match_sqlite3(contents)
+    unless defined?(JRUBY_VERSION)
+      assert_match(/group :development do\n  gem "sqlite3"\nend/, contents)
+    else
+      assert_match(/group :development do\n  gem "activerecord-jdbcsqlite3-adapter"\nend/, contents)
+    end
+  end
 end
diff --git a/railties/test/generators/task_generator_test.rb b/railties/test/generators/task_generator_test.rb
index 9399be9510..d5bd44b9db 100644
--- a/railties/test/generators/task_generator_test.rb
+++ b/railties/test/generators/task_generator_test.rb
@@ -7,6 +7,18 @@ class TaskGeneratorTest < Rails::Generators::TestCase
 
   def test_task_is_created
     run_generator
-    assert_file "lib/tasks/feeds.rake", /namespace :feeds/
+    assert_file "lib/tasks/feeds.rake" do |content|
+      assert_match(/namespace :feeds/, content)
+      assert_match(/task foo:/, content)
+      assert_match(/task bar:/, content)
+    end
+  end
+
+  def test_task_on_revoke
+    task_path = 'lib/tasks/feeds.rake'
+    run_generator
+    assert_file task_path
+    run_generator ['feeds'], behavior: :revoke
+    assert_no_file task_path
   end
 end