Restore constraints on note id parameter

diff --git a/config/routes.rb b/config/routes.rb
index d1e4c74ae5e06c0d00736051520e1031bdd96411..8271e7e4dba1b95f05b4027af56a5d5cc0aac605 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -122,7 +122,7 @@ OpenStreetMap::Application.routes.draw do
     match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post]
   end
   get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }
     match :subscribe, :unsubscribe, :on => :member, :via => [:get, :post]
   end
   get "/changeset/:id/comments/feed" => "changeset_comments#index", :as => :changeset_comments_feed, :id => /\d*/, :defaults => { :format => "rss" }

-  resources :notes, :path => "note", :only => [:show, :new]
+  resources :notes, :path => "note", :id => /\d+/, :only => [:show, :new]

 
   get "/user/:display_name/history" => "changesets#index"
   get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }
 
   get "/user/:display_name/history" => "changesets#index"
   get "/user/:display_name/history/feed" => "changesets#feed", :defaults => { :format => :atom }

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index e68a5f33beec2f4eb3c44a2d76da25c9f88788ec..ff1071897f79d197ba24cc8a16a40cec8b754fac 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -179,9 +179,9 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
       get path_method.call
     end
 
       get path_method.call
     end
 

-    # assert_raise ActionController::UrlGenerationError do
-    #   get path_method.call(:id => -10) # we won't have an id that's negative
-    # end
+    assert_raise ActionController::UrlGenerationError do
+      get path_method.call(:id => -10) # we won't have an id that's negative
+    end

 
     get path_method.call(:id => 0)
     assert_response :not_found
 
     get path_method.call(:id => 0)
     assert_response :not_found