Fix test to make sure it picks up the right token

[rails.git] / test / functional / old_node_controller_test.rb

diff --git a/test/functional/old_node_controller_test.rb b/test/functional/old_node_controller_test.rb
index ebc38775163b72d16a3e82061197861a72bd15a7..44edc06a2f7c6dc822a1530e3a37c1285f45227a 100644 (file)
--- a/test/functional/old_node_controller_test.rb
+++ b/test/functional/old_node_controller_test.rb
@@ -19,6 +19,10 @@ class OldNodeControllerTest < ActionController::TestCase
       { :path => "/api/0.6/node/1/2", :method => :get },
       { :controller => "old_node", :action => "version", :id => "1", :version => "2" }
     )
+    assert_routing(
+      { :path => "/api/0.6/node/1/2/redact", :method => :post },
+      { :controller => "old_node", :action => "redact", :id => "1", :version => "2" }
+    )
   end
 
   ##
@@ -152,6 +156,8 @@ class OldNodeControllerTest < ActionController::TestCase
   def check_not_found_id_version(id, version)
     get :version, :id => id, :version => version
     assert_response :not_found
+  rescue ActionController::RoutingError => ex
+    assert_match /No route matches/, ex.to_s
   end
   
   ##
@@ -222,7 +228,6 @@ class OldNodeControllerTest < ActionController::TestCase
 
     # not even to a logged-in user
     basic_authorization(users(:public_user).email, "test")
-    get :version, :id => node.node_id, :version => node.version
     get :history, :id => node.node_id
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history, even when logged in."
@@ -238,14 +243,20 @@ class OldNodeControllerTest < ActionController::TestCase
     do_redact_node(node, redactions(:example))
     assert_response :success, "should be OK to redact old version as moderator."
 
-    # check moderator can still see the redacted data
+    # check moderator can still see the redacted data, when passing
+    # the appropriate flag
     get :version, :id => node.node_id, :version => node.version
-    assert_response :success, "After redaction, node should not be gone for moderator."
+    assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
+    get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true'
+    assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
     
     # and when accessed via history
     get :history, :id => node.node_id
     assert_response :success, "Redaction shouldn't have stopped history working."
-    assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators."
+    assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag."
+    get :history, :id => node.node_id, :show_redactions => 'true'
+    assert_response :success, "Redaction shouldn't have stopped history working."
+    assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag."
   end
 
   # testing that if the moderator drops auth, he can't see the
@@ -265,7 +276,6 @@ class OldNodeControllerTest < ActionController::TestCase
     assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
     
     # and when accessed via history
-    get :version, :id => node.node_id, :version => node.version
     get :history, :id => node.node_id
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history."