aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-07 21:33:27 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:04 +0200
commit7d7263bf9dbf814f10803f5ec553ac2b0190b6a9 (patch)
treee6ec9d3ea8c4465130d3798740396e45426c6407
parente4bd7ed2fa60a0dbb03bbdea6fa532c6ea0ee704 (diff)
downloadrails-7d7263bf9dbf814f10803f5ec553ac2b0190b6a9.tar.gz
rails-7d7263bf9dbf814f10803f5ec553ac2b0190b6a9.tar.bz2
rails-7d7263bf9dbf814f10803f5ec553ac2b0190b6a9.zip
We don't need to overwrite default paths in tests
-rw-r--r--railties/test/railties/engine_test.rb8
1 files 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