aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-12-07 06:02:43 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2012-12-07 06:02:43 +0000
commitaf73e3cb15c966129221009f1de35dea8de6578e (patch)
tree9198ef801d6626b0b30e686700390ca6b8e4b977 /railties/test/application
parent55dec5a7da3e0bed51b1a37d152df9c7395e5a80 (diff)
downloadrails-af73e3cb15c966129221009f1de35dea8de6578e.tar.gz
rails-af73e3cb15c966129221009f1de35dea8de6578e.tar.bz2
rails-af73e3cb15c966129221009f1de35dea8de6578e.zip
Revert "Invert precedence of content in ActionDispatch::Static"
This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864.
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/routing_test.rb23
1 files changed, 0 insertions, 23 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 0550afdb40..ffcdeac7f0 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -268,28 +268,5 @@ module ApplicationTests
get '/yazilar'
assert_equal 200, last_response.status
end
-
- test 'routes take precedence over static files' do
- app('development')
-
- app_file 'config/routes.rb', <<-RUBY
- AppTemplate::Application.routes.draw do
- get 'foo', to: 'foo#index'
- end
- RUBY
-
- app_file 'public/foo.json', '{"foo":"bar"}'
-
- controller :foo, <<-RUBY
- class FooController < ApplicationController
- def index
- render json: { foo: 'baz' }
- end
- end
- RUBY
-
- get '/foo.json'
- assert_equal '{"foo":"baz"}', last_response.body
- end
end
end