Merge pull request #27 from danstowell/jsrouting-topclosebox

[rails.git] / test / controllers / changeset_controller_test.rb

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index e4c2903e0a1c735a1e1c9781df7bd32ef6274c00..4617383303aeb34203414db00a2b09e39f0ad4d5 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -29,12 +29,12 @@ class ChangesetControllerTest < ActionController::TestCase
       { :controller => "changeset", :action => "read", :id => "1" }
     )
     assert_routing(
       { :controller => "changeset", :action => "read", :id => "1" }
     )
     assert_routing(

-        { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
-        { :controller => "changeset", :action => "subscribe", :id => "1" }
+      { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
+      { :controller => "changeset", :action => "subscribe", :id => "1" }

     )
     assert_routing(
     )
     assert_routing(

-        { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
-        { :controller => "changeset", :action => "unsubscribe", :id => "1" }
+      { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
+      { :controller => "changeset", :action => "unsubscribe", :id => "1" }

     )
     assert_routing(
       { :path => "/api/0.6/changeset/1", :method => :put },
     )
     assert_routing(
       { :path => "/api/0.6/changeset/1", :method => :put },


@@ -45,29 +45,25 @@ class ChangesetControllerTest < ActionController::TestCase
       { :controller => "changeset", :action => "close", :id => "1" }
     )
     assert_routing(
       { :controller => "changeset", :action => "close", :id => "1" }
     )
     assert_routing(

-        { :path => "/api/0.6/changeset/1/comment", :method => :post },
-        { :controller => "changeset", :action => "comment", :id => "1" }
+      { :path => "/api/0.6/changeset/1/comment", :method => :post },
+      { :controller => "changeset", :action => "comment", :id => "1" }

     )
     assert_routing(
     )
     assert_routing(

-        { :path => "/api/0.6/changeset/comments/feed", :method => :get },
-        { :controller => "changeset", :action => "comments_feed", :format =>"rss" }
+      { :path => "/api/0.6/changeset/comment/1/hide", :method => :post },
+      { :controller => "changeset", :action => "hide_comment", :id => "1" }

     )
     assert_routing(
     )
     assert_routing(

-        { :path => "/api/0.6/changeset/1/comments/feed", :method => :get },
-        { :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
-    )
-    assert_routing(
-        { :path => "/api/0.6/changeset/comment/1/hide", :method => :post },
-        { :controller => "changeset", :action => "hide_comment", :id => "1" }
-    )
-    assert_routing(
-        { :path => "/api/0.6/changeset/comment/1/unhide", :method => :post },
-        { :controller => "changeset", :action => "unhide_comment", :id => "1" }
+      { :path => "/api/0.6/changeset/comment/1/unhide", :method => :post },
+      { :controller => "changeset", :action => "unhide_comment", :id => "1" }

     )
     assert_routing(
       { :path => "/api/0.6/changesets", :method => :get },
       { :controller => "changeset", :action => "query" }
     )
     )
     assert_routing(
       { :path => "/api/0.6/changesets", :method => :get },
       { :controller => "changeset", :action => "query" }
     )

+    assert_routing(
+      { :path => "/changeset/1/comments/feed", :method => :get },
+      { :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
+    )

     assert_routing(
       { :path => "/user/name/history", :method => :get },
       { :controller => "changeset", :action => "list", :display_name => "name" }
     assert_routing(
       { :path => "/user/name/history", :method => :get },
       { :controller => "changeset", :action => "list", :display_name => "name" }


@@ -92,6 +88,10 @@ class ChangesetControllerTest < ActionController::TestCase
       { :path => "/history/feed", :method => :get },
       { :controller => "changeset", :action => "feed", :format => :atom }
     )
       { :path => "/history/feed", :method => :get },
       { :controller => "changeset", :action => "feed", :format => :atom }
     )

+    assert_routing(
+      { :path => "/history/comments/feed", :method => :get },
+      { :controller => "changeset", :action => "comments_feed", :format =>"rss" }
+    )

   end
 
   # -----------------------
   end
 
   # -----------------------