4 files changed, 14 insertions, 6 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 20d1d76d78..1557b90d27 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -61,7 +61,7 @@ module ApplicationTests
 
       boot!
 
-      assert_equal "Rack::Cache", middleware.first
+      assert middleware.include?("Rack::Cache")
     end
 
     test "ActiveRecord::Migration::CheckPending is present when active_record.migration_error is set to :page_load" do
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 6f03cf3083..257d07f514 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -113,6 +113,9 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     FileUtils.mv(app_root, app_moved_root)
 
+    # make sure we are in correct dir
+    FileUtils.cd(app_moved_root)
+
     generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
                                                                destination_root: app_moved_root, shell: @shell
     generator.send(:app_const)
@@ -288,7 +291,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-sprockets"]
     assert_file "config/application.rb" do |content|
       assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
-      assert_match(/config\.assets\.enabled = false/, content)
     end
     assert_file "Gemfile" do |content|
       assert_no_match(/sass-rails/, content)
@@ -364,7 +366,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_inclusion_of_debugger
     run_generator
-    assert_file "Gemfile", /# gem 'debugger'/
+    if defined?(JRUBY_VERSION)
+      assert_file "Gemfile" do |content|
+        assert_no_match(/debugger/, content)
+      end
+    else
+      assert_file "Gemfile", /# gem 'debugger'/
+    end
   end
 
   def test_inclusion_of_lazy_loaded_sdoc
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index c6b91e7cba..7319a4e9d3 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -309,7 +309,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_creating_plugin_in_app_directory_adds_gemfile_entry
-    # simulate application existance
+    # simulate application existence
     gemfile_path = "#{Rails.root}/Gemfile"
     Object.const_set('APP_PATH', Rails.root)
     FileUtils.touch gemfile_path
@@ -323,7 +323,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_skipping_gemfile_entry
-    # simulate application existance
+    # simulate application existence
     gemfile_path = "#{Rails.root}/Gemfile"
     Object.const_set('APP_PATH', Rails.root)
     FileUtils.touch gemfile_path
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 3075ffee0d..c4b18e9ea5 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -399,7 +399,7 @@ YAML
       assert $plugin_initializer
     end
 
-    test "midleware referenced in configuration" do
+    test "middleware referenced in configuration" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         class Bukkits
           def initialize(app)