use a controller method to handle cancan denials

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

diff --git a/test/controllers/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb
index 36b35ec38504db62703b233f06fa060357df0660..be91962f8fff776af17f1a1049503eeb9d5bc32d 100644 (file)
--- a/test/controllers/old_relation_controller_test.rb
+++ b/test/controllers/old_relation_controller_test.rb
@@ -24,11 +24,11 @@ class OldRelationControllerTest < ActionController::TestCase
   # -------------------------------------
   def test_history
     # check that a visible relations is returned properly
   # -------------------------------------
   def test_history
     # check that a visible relations is returned properly

-    get :history, :id => create(:relation, :with_history).id
+    get :history, :params => { :id => create(:relation, :with_history).id }

     assert_response :success
 
     # check chat a non-existent relations is not returned
     assert_response :success
 
     # check chat a non-existent relations is not returned

-    get :history, :id => 0
+    get :history, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -50,7 +50,7 @@ class OldRelationControllerTest < ActionController::TestCase
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 

-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"

 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :forbidden, "should need to be moderator to redact."
 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :forbidden, "should need to be moderator to redact."


@@ -63,7 +63,7 @@ class OldRelationControllerTest < ActionController::TestCase
     relation = create(:relation, :with_history, :version => 4)
     relation_latest = relation.old_relations.last
 
     relation = create(:relation, :with_history, :version => 4)
     relation_latest = relation.old_relations.last
 

-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"

 
     do_redact_relation(relation_latest, create(:redaction))
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
 
     do_redact_relation(relation_latest, create(:redaction))
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."


@@ -77,12 +77,12 @@ class OldRelationControllerTest < ActionController::TestCase
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 

-    get :version, :id => relation_v1.relation_id, :version => relation_v1.version
+    get :version, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
 
     # not even to a logged-in user
     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
 
     # not even to a logged-in user

-    basic_authorization(create(:user).email, "test")
-    get :version, :id => relation_v1.relation_id, :version => relation_v1.version
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
   end
 
     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API, even when logged in."
   end
 


@@ -93,14 +93,14 @@ class OldRelationControllerTest < ActionController::TestCase
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 

-    get :history, :id => relation_v1.relation_id
+    get :history, :params => { :id => relation_v1.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0, "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history."
 
     # not even to a logged-in user
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0, "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history."
 
     # not even to a logged-in user

-    basic_authorization(create(:user).email, "test")
-    get :version, :id => relation_v1.relation_id, :version => relation_v1.version
-    get :history, :id => relation_v1.relation_id
+    basic_authorization create(:user).email, "test"
+    get :version, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }
+    get :history, :params => { :id => relation_v1.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0, "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history, even when logged in."
   end
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 0, "redacted relation #{relation_v1.relation_id} version #{relation_v1.version} shouldn't be present in the history, even when logged in."
   end


@@ -112,23 +112,23 @@ class OldRelationControllerTest < ActionController::TestCase
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 

-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"

 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # check moderator can still see the redacted data, when passing
     # the appropriate flag
 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # check moderator can still see the redacted data, when passing
     # the appropriate flag

-    get :version, :id => relation_v3.relation_id, :version => relation_v3.version
+    get :version, :params => { :id => relation_v3.relation_id, :version => relation_v3.version }

     assert_response :forbidden, "After redaction, relation should be gone for moderator, when flag not passed."
     assert_response :forbidden, "After redaction, relation should be gone for moderator, when flag not passed."

-    get :version, :id => relation_v3.relation_id, :version => relation_v3.version, :show_redactions => "true"
+    get :version, :params => { :id => relation_v3.relation_id, :version => relation_v3.version, :show_redactions => "true" }

     assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
 
     # and when accessed via history
     assert_response :success, "After redaction, relation should not be gone for moderator, when flag passed."
 
     # and when accessed via history

-    get :history, :id => relation_v3.relation_id
+    get :history, :params => { :id => relation_v3.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0, "relation #{relation_v3.relation_id} version #{relation_v3.version} should not be present in the history for moderators when not passing flag."
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0, "relation #{relation_v3.relation_id} version #{relation_v3.version} should not be present in the history for moderators when not passing flag."

-    get :history, :id => relation_v3.relation_id, :show_redactions => "true"
+    get :history, :params => { :id => relation_v3.relation_id, :show_redactions => "true" }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 1, "relation #{relation_v3.relation_id} version #{relation_v3.version} should still be present in the history for moderators when passing flag."
   end
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 1, "relation #{relation_v3.relation_id} version #{relation_v3.version} should still be present in the history for moderators when passing flag."
   end


@@ -139,20 +139,20 @@ class OldRelationControllerTest < ActionController::TestCase
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 
     relation = create(:relation, :with_history, :version => 4)
     relation_v3 = relation.old_relations.find_by(:version => 3)
 

-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"

 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator
 
     do_redact_relation(relation_v3, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator

-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"

 
     # check can't see the redacted data
 
     # check can't see the redacted data

-    get :version, :id => relation_v3.relation_id, :version => relation_v3.version
+    get :version, :params => { :id => relation_v3.relation_id, :version => relation_v3.version }

     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
 
     # and when accessed via history
     assert_response :forbidden, "Redacted relation shouldn't be visible via the version API."
 
     # and when accessed via history

-    get :history, :id => relation_v3.relation_id
+    get :history, :params => { :id => relation_v3.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0, "redacted relation #{relation_v3.relation_id} version #{relation_v3.version} shouldn't be present in the history."
   end
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v3.relation_id}'][version='#{relation_v3.version}']", 0, "redacted relation #{relation_v3.relation_id} version #{relation_v3.version} shouldn't be present in the history."
   end


@@ -165,7 +165,7 @@ class OldRelationControllerTest < ActionController::TestCase
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 

-    post :redact, :id => relation_v1.relation_id, :version => relation_v1.version
+    post :redact, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :unauthorized, "should need to be authenticated to unredact."
   end
 
     assert_response :unauthorized, "should need to be authenticated to unredact."
   end
 


@@ -177,9 +177,9 @@ class OldRelationControllerTest < ActionController::TestCase
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 

-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"

 
 

-    post :redact, :id => relation_v1.relation_id, :version => relation_v1.version
+    post :redact, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :forbidden, "should need to be moderator to unredact."
   end
 
     assert_response :forbidden, "should need to be moderator to unredact."
   end
 


@@ -191,29 +191,29 @@ class OldRelationControllerTest < ActionController::TestCase
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 
     relation_v1 = relation.old_relations.find_by(:version => 1)
     relation_v1.redact!(create(:redaction))
 

-    basic_authorization(create(:moderator_user).email, "test")
+    basic_authorization create(:moderator_user).email, "test"

 
 

-    post :redact, :id => relation_v1.relation_id, :version => relation_v1.version
+    post :redact, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :success, "should be OK to unredact old version as moderator."
 
     # check moderator can still see the redacted data, without passing
     # the appropriate flag
     assert_response :success, "should be OK to unredact old version as moderator."
 
     # check moderator can still see the redacted data, without passing
     # the appropriate flag

-    get :version, :id => relation_v1.relation_id, :version => relation_v1.version
+    get :version, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :success, "After unredaction, relation should not be gone for moderator."
 
     # and when accessed via history
     assert_response :success, "After unredaction, relation should not be gone for moderator."
 
     # and when accessed via history

-    get :history, :id => relation_v1.relation_id
+    get :history, :params => { :id => relation_v1.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1, "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for moderators."
 
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1, "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for moderators."
 

-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(:user).email, "test"

 
     # check normal user can now see the redacted data
 
     # check normal user can now see the redacted data

-    get :version, :id => relation_v1.relation_id, :version => relation_v1.version
+    get :version, :params => { :id => relation_v1.relation_id, :version => relation_v1.version }

     assert_response :success, "After redaction, node should not be gone for normal user."
 
     # and when accessed via history
     assert_response :success, "After redaction, node should not be gone for normal user."
 
     # and when accessed via history

-    get :history, :id => relation_v1.relation_id
+    get :history, :params => { :id => relation_v1.relation_id }

     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1, "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for normal users."
   end
     assert_response :success, "Redaction shouldn't have stopped history working."
     assert_select "osm relation[id='#{relation_v1.relation_id}'][version='#{relation_v1.version}']", 1, "relation #{relation_v1.relation_id} version #{relation_v1.version} should still be present in the history for normal users."
   end


@@ -226,14 +226,14 @@ class OldRelationControllerTest < ActionController::TestCase
   def check_current_version(relation_id)
     # get the current version
     current_relation = with_controller(RelationController.new) do
   def check_current_version(relation_id)
     # get the current version
     current_relation = with_controller(RelationController.new) do

-      get :read, :id => relation_id
+      get :read, :params => { :id => relation_id }

       assert_response :success, "can't get current relation #{relation_id}"
       Relation.from_xml(@response.body)
     end
     assert_not_nil current_relation, "getting relation #{relation_id} returned nil"
 
     # get the "old" version of the relation from the version method
       assert_response :success, "can't get current relation #{relation_id}"
       Relation.from_xml(@response.body)
     end
     assert_not_nil current_relation, "getting relation #{relation_id} returned nil"
 
     # get the "old" version of the relation from the version method

-    get :version, :id => relation_id, :version => current_relation.version
+    get :version, :params => { :id => relation_id, :version => current_relation.version }

     assert_response :success, "can't get old relation #{relation_id}, v#{current_relation.version}"
     old_relation = Relation.from_xml(@response.body)
 
     assert_response :success, "can't get old relation #{relation_id}, v#{current_relation.version}"
     old_relation = Relation.from_xml(@response.body)
 


@@ -245,7 +245,7 @@ class OldRelationControllerTest < ActionController::TestCase
   # look at all the versions of the relation in the history and get each version from
   # the versions call. check that they're the same.
   def check_history_equals_versions(relation_id)
   # look at all the versions of the relation in the history and get each version from
   # the versions call. check that they're the same.
   def check_history_equals_versions(relation_id)

-    get :history, :id => relation_id
+    get :history, :params => { :id => relation_id }

     assert_response :success, "can't get relation #{relation_id} from API"
     history_doc = XML::Parser.string(@response.body).parse
     assert_not_nil history_doc, "parsing relation #{relation_id} history failed"
     assert_response :success, "can't get relation #{relation_id} from API"
     history_doc = XML::Parser.string(@response.body).parse
     assert_not_nil history_doc, "parsing relation #{relation_id} history failed"


@@ -254,7 +254,7 @@ class OldRelationControllerTest < ActionController::TestCase
       history_relation = Relation.from_xml_node(relation_doc)
       assert_not_nil history_relation, "parsing relation #{relation_id} version failed"
 
       history_relation = Relation.from_xml_node(relation_doc)
       assert_not_nil history_relation, "parsing relation #{relation_id} version failed"
 

-      get :version, :id => relation_id, :version => history_relation.version
+      get :version, :params => { :id => relation_id, :version => history_relation.version }

       assert_response :success, "couldn't get relation #{relation_id}, v#{history_relation.version}"
       version_relation = Relation.from_xml(@response.body)
       assert_not_nil version_relation, "failed to parse #{relation_id}, v#{history_relation.version}"
       assert_response :success, "couldn't get relation #{relation_id}, v#{history_relation.version}"
       version_relation = Relation.from_xml(@response.body)
       assert_not_nil version_relation, "failed to parse #{relation_id}, v#{history_relation.version}"


@@ -264,10 +264,10 @@ class OldRelationControllerTest < ActionController::TestCase
   end
 
   def do_redact_relation(relation, redaction)
   end
 
   def do_redact_relation(relation, redaction)

-    get :version, :id => relation.relation_id, :version => relation.version
+    get :version, :params => { :id => relation.relation_id, :version => relation.version }

     assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
 
     # now redact it
     assert_response :success, "should be able to get version #{relation.version} of relation #{relation.relation_id}."
 
     # now redact it

-    post :redact, :id => relation.relation_id, :version => relation.version, :redaction => redaction.id
+    post :redact, :params => { :id => relation.relation_id, :version => relation.version, :redaction => redaction.id }

   end
 end
   end
 end