diff options
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 | ||||
-rw-r--r-- | railties/test/railties/engine_test.rb | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 477bbbc1e7..f9f06299a0 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -23,6 +23,7 @@ module Rails @session_options = {} @time_zone = "UTC" @middleware = app_middleware + @asset_path = '/' end def asset_path=(value) diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 370f9342e3..6fc166e054 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -281,6 +281,34 @@ module RailtiesTest assert_equal expected, stripped_body end + test "default application's asset_path" do + @plugin.write "config/routes.rb", <<-RUBY + Bukkits::Engine.routes.draw do + match "/foo" => "foo#index" + end + RUBY + + @plugin.write "app/controllers/foo_controller.rb", <<-RUBY + class FooController < ActionController::Base + def index + end + end + RUBY + + @plugin.write "app/views/foo/index.html.erb", <<-RUBY + <%= compute_public_path("/foo", "") %> + RUBY + + boot_rails + + env = Rack::MockRequest.env_for("/foo") + response = Bukkits::Engine.call(env) + stripped_body = response[2].body.strip + + expected = "/bukkits/foo" + assert_equal expected, stripped_body + end + test "engine's files are served via ActionDispatch::Static" do add_to_config "config.serve_static_assets = true" |