aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2009-12-23 16:26:10 -0800
committerCarlhuda <carlhuda@engineyard.com>2009-12-23 16:26:10 -0800
commit61af34b001b295af36c346d245a65d74de0e1f97 (patch)
treef78cda03c79077d50cb85b722f008b5947f86025
parent83be262b4b2e415fe9be319eb6b187bcf415fb6d (diff)
downloadrails-61af34b001b295af36c346d245a65d74de0e1f97.tar.gz
rails-61af34b001b295af36c346d245a65d74de0e1f97.tar.bz2
rails-61af34b001b295af36c346d245a65d74de0e1f97.zip
Make /rails/info/properties work again. Also, the mocked up tests were passing so we added a test that actually tested this functionality.
-rw-r--r--railties/builtin/routes.rb2
-rw-r--r--railties/test/application/routing_test.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/builtin/routes.rb b/railties/builtin/routes.rb
index 26a0daaa8c..ef9d9e756d 100644
--- a/railties/builtin/routes.rb
+++ b/railties/builtin/routes.rb
@@ -1,3 +1,3 @@
ActionController::Routing::Routes.draw do |map|
- match '/rails/info/properties' => "rails::info#properties"
+ match '/rails/info/properties' => "rails/info#properties"
end \ No newline at end of file
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index ece9b13f8a..49c548ad5c 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -19,6 +19,11 @@ module ApplicationTests
end
end
+ test "rails/info/properties" do
+ get "/rails/info/properties"
+ assert_equal 200, last_response.status
+ end
+
test "simple controller" do
controller :foo, <<-RUBY
class FooController < ActionController::Base