From 3768739adf808ecbca572d73e1407c6989734349 Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Tue, 8 Feb 2011 11:16:23 -0500 Subject: [PATCH] Committed a failing test --- railties/test/railties/engine_test.rb | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 92aa025..f262eee 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -305,6 +305,34 @@ module RailtiesTest get("/bukkits/file_from_app.html") assert_equal File.read(File.join(app_path, "public/bukkits/file_from_app.html")), last_response.body end + + test "an applications files are given priority over an engines files when served via ActionDispatch::Static" do + add_to_config "config.serve_static_assets = true" + + @plugin.write "lib/bukkits.rb", <<-RUBY + class Bukkits + class Engine < ::Rails::Engine + engine_name :bukkits + end + end + RUBY + + app_file "config/routes.rb", <<-RUBY + AppTemplate::Application.routes.draw do + mount Bukkits::Engine => "/bukkits" + end + RUBY + + @plugin.write "public/bukkits.html", "in engine" + + app_file "public/bukkits/bukkits.html", "in app" + + boot_rails + + get('/bukkits/bukkits.html') + + assert_equal 'in app', last_response.body.strip + end test "shared engine should include application's helpers and own helpers" do app_file "config/routes.rb", <<-RUBY -- 1.7.1.1