Fix tests.

2 files changed, 5 insertions, 3 deletions

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index f7423cd566..530863fd08 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -199,6 +199,8 @@ module RailtiesTest
     end
 
     test "it allows to set asset_path" do
+      add_to_config("config.assets.enabled = false")
+
       @plugin.write "lib/bukkits.rb", <<-RUBY
         class Bukkits
           class Engine < ::Rails::Engine
@@ -206,7 +208,6 @@ module RailtiesTest
         end
       RUBY
 
-
       @plugin.write "config/routes.rb", <<-RUBY
         Bukkits::Engine.routes.draw do
           match "/foo" => "foo#index"
@@ -774,6 +775,7 @@ module RailtiesTest
     test "ensure that engine properly sets assets directories" do
       add_to_config("config.action_dispatch.show_exceptions = false")
       add_to_config("config.serve_static_assets = true")
+      add_to_config("config.assets.enabled = false")
 
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module Bukkits
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 5cd1818f4b..46bab2a47b 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -32,13 +32,13 @@ module RailtiesTest
       end
     end
 
-    def test_copying_assets
+    def test_copying_public
       @plugin.write "public/javascripts/foo.js", "doSomething()"
       @plugin.write "public/stylesheets/foo.css", "h1 { font-size: 10000px }"
       @plugin.write "public/images/img.png", ""
 
       Dir.chdir(app_path) do
-        `rake bukkits:install:assets --trace`
+        `rake bukkits:install:public --trace`
 
         assert File.exists?(app_path("public/bukkits/javascripts/foo.js"))
         assert_equal "doSomething()\n", File.read(app_path("public/bukkits/javascripts/foo.js"))