From 7d7263bf9dbf814f10803f5ec553ac2b0190b6a9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 7 Jul 2010 21:33:27 +0200
Subject: [PATCH] We don't need to overwrite default paths in tests

---
 railties/test/railties/engine_test.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index ad2f769f34..eeebbcc01f 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -114,12 +114,11 @@ module RailtiesTest
       @plugin.write "lib/bukkits.rb", <<-RUBY
         class Bukkits
           class Engine < ::Rails::Engine
-            paths.vendor.plugins = "#{File.join(@plugin.path, "lib/bukkits/plugins")}"
           end
         end
       RUBY
 
-      @plugin.write "lib/bukkits/plugins/yaffle/init.rb", <<-RUBY
+      @plugin.write "vendor/plugins/yaffle/init.rb", <<-RUBY
         config.yaffle_loaded = true
       RUBY
 
@@ -132,13 +131,12 @@ module RailtiesTest
       @plugin.write "lib/bukkits.rb", <<-RUBY
         class Bukkits
           class Engine < ::Rails::Engine
-            paths.public = "#{File.join(@plugin.path, "lib/bukkits/public")}"
             config.serve_static_assets = true
           end
         end
       RUBY
 
-      @plugin.write "lib/bukkits/public/omg.txt", <<-RUBY
+      @plugin.write "public/omg.txt", <<-RUBY
         OMG
       RUBY
 
@@ -151,7 +149,7 @@ module RailtiesTest
       env = Rack::MockRequest.env_for("/bukkits/omg.txt")
       response = Rails::Application.call(env)
 
-      assert_equal response[2].path, File.join(@plugin.path, "lib/bukkits/public/omg.txt")
+      assert_equal response[2].path, File.join(@plugin.path, "public/omg.txt")
     end
   end
 end