Require version 0.4.0.1 of the oauth-plugin gem

[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 efef38ad18c19fb9c808f29db202cf12e2ca3b01..ff776d67f48cf07529c755a4e33cf901d2bb1322 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" }
     )
       { :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
 
   ##
   end
 
   ##


@@ -193,7 +197,7 @@ class OldNodeControllerTest < ActionController::TestCase
 
     do_redact_node(nodes(:node_with_versions_v4),
                    redactions(:example))
 
     do_redact_node(nodes(:node_with_versions_v4),
                    redactions(:example))

-    assert_response :forbidden, "shouldn't be OK to redact current version as moderator."
+    assert_response :bad_request, "shouldn't be OK to redact current version as moderator."

   end    
 
   ##
   end    
 
   ##


@@ -222,7 +226,6 @@ class OldNodeControllerTest < ActionController::TestCase
 
     # not even to a logged-in user
     basic_authorization(users(:public_user).email, "test")
 
     # 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."
     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 +241,20 @@ class OldNodeControllerTest < ActionController::TestCase
     do_redact_node(node, redactions(:example))
     assert_response :success, "should be OK to redact old version as moderator."
 
     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
     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."
     
     # 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
   end
 
   # testing that if the moderator drops auth, he can't see the


@@ -265,7 +274,6 @@ class OldNodeControllerTest < ActionController::TestCase
     assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
     
     # and when accessed via history
     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."
     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."