prepend the assets route instead of appending, closes #436

3 files changed, 30 insertions, 4 deletions

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
new file mode 100644
index 0000000000..b03dc3132b
--- /dev/null
+++ b/railties/test/application/assets_test.rb
@@ -0,0 +1,27 @@
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class RoutingTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    test "assets routes have higher priority" do
+      app_file "app/assets/javascripts/demo.js.erb", "<%= :alert %>();"
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
+        end
+      RUBY
+
+      get "/assets/demo.js"
+      assert_match "alert()", last_response.body
+    end
+  end
+end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 62589c998d..e3a7f8a63c 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,14 +1,14 @@
 require 'isolation/abstract_unit'
+require 'rack/test'
 
 module ApplicationTests
   class RoutingTest < Test::Unit::TestCase
     include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
 
     def setup
       build_app
       boot_rails
-      require 'rack/test'
-      extend Rack::Test::Methods
     end
 
     test "rails/info/properties in development" do
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index e975950b85..e5debf29ae 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -15,11 +15,10 @@ module RailtiesTest
 
       boot_rails
       require 'rack/test'
-      require 'coffee_script'
       extend Rack::Test::Methods
 
       get "/assets/engine.js"
-      assert_match "alert();", last_response.body
+      assert_match "alert()", last_response.body
     end
 
     def test_copying_migrations