Invert precedence of content in ActionDispatch::Static

This commit inverts the precedence in ActionDispatch::Static so that
dynamic content will be served before static content. This is so that
precompiled assets do not inadvertently get included when running in
development mode - it should have no effect in production where static
files are usually handled by the web server.

Closes #6421

1 files changed, 10 insertions, 5 deletions

diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 112f470786..f90be450e2 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -4,11 +4,19 @@ require 'rbconfig'
 
 module StaticTests
   def test_serves_dynamic_content
+    dummy_app = lambda { |env| [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]] }
+    @app = ActionDispatch::Static.new(dummy_app, "#{FIXTURE_LOAD_PATH}/public", "public, max-age=60")
     assert_equal "Hello, World!", get("/nofile").body
   end
 
+  def test_dynamic_content_has_precedence_over_static_files
+    dummy_app = lambda { |env| [200, {"Content-Type" => "text/html"}, ["/foo/baz.html"]] }
+    @app = ActionDispatch::Static.new(dummy_app, "#{FIXTURE_LOAD_PATH}/public", "public, max-age=60")
+    assert_html "/foo/baz.html", get("/foo/bar.html")
+  end
+
   def test_handles_urls_with_bad_encoding
-    assert_equal "Hello, World!", get("/doorkeeper%E3E4").body
+    assert_equal "", get("/doorkeeper%E3E4").body
   end
 
   def test_sets_cache_control
@@ -40,7 +48,6 @@ module StaticTests
     assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}")
   end
 
-
   def test_serves_static_file_with_exclamation_mark_in_filename
     with_static_file "/foo/foo!bar.html" do |file|
       assert_html file, get("/foo/foo%21bar.html")
@@ -142,9 +149,7 @@ module StaticTests
 end
 
 class StaticTest < ActiveSupport::TestCase
-  DummyApp = lambda { |env|
-    [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]]
-  }
+  DummyApp = lambda { |env| [404, {"X-Cascade" => "pass"}, []] }
   App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public", "public, max-age=60")
 
   def setup