From: Tom Hughes <tom@compton.nu>
Date: Sun, 7 Jul 2013 18:24:18 +0000 (+0100)
Subject: Rails now defaults to using PATCH for updates
X-Git-Tag: live~4730
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bd8d207ea42baa50f0a09daa31630c4e3014ac93

Rails now defaults to using PATCH for updates
---

diff --git a/config/routes.rb b/config/routes.rb
index 0b9a39d7e..514c6f756 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,9 +178,9 @@ OpenStreetMap::Application.routes.draw do
   match '/traces/mine/page/:page' => 'trace#mine', :via => :get
   match '/traces/mine' => 'trace#mine', :via => :get
   match '/trace/create' => 'trace#create', :via => [:get, :post]
-  match '/trace/:id/data' => 'trace#data', :via => :get
-  match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :put]
-  match '/trace/:id/delete' => 'trace#delete', :via => :post
+  match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/
+  match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/
+  match '/trace/:id/delete' => 'trace#delete', :via => :post, :id => /\d+/
 
   # diary pages
   match '/diary/new' => 'diary_entry#new', :via => [:get, :post]
diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 600fd589f..4c97a4849 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -141,7 +141,7 @@ class TraceControllerTest < ActionController::TestCase
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(
-      { :path => "/trace/1/edit", :method => :put },
+      { :path => "/trace/1/edit", :method => :patch },
       { :controller => "trace", :action => "edit", :id => "1" }
     )
     assert_routing(