Merge remote-tracking branch 'upstream/pull/2600'

[rails.git] / test / controllers / api / old_nodes_controller_test.rb

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index 941787d0a2872ddd39d31693cadfb2f40c67c580..76e78ffadaa47b8df30cfe495d40f34d2429e57c 100644 (file)
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -17,6 +17,14 @@ module Api
         { :path => "/api/0.6/node/1/2", :method => :get },
         { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2" }
       )
+      assert_routing(
+        { :path => "/api/0.6/node/1/history.json", :method => :get },
+        { :controller => "api/old_nodes", :action => "history", :id => "1", :format => "json" }
+      )
+      assert_routing(
+        { :path => "/api/0.6/node/1/2.json", :method => :get },
+        { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2", :format => "json" }
+      )
       assert_routing(
         { :path => "/api/0.6/node/1/2/redact", :method => :post },
         { :controller => "api/old_nodes", :action => "redact", :id => "1", :version => "2" }