Merge remote-tracking branch 'openstreetmap/pull/1507'

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

diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
index bfde1506615d327120356717278decca946368d1..babb9df134a735135a561ccafcc03c8ea419ae19 100644 (file)
--- a/test/controllers/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -196,11 +196,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # test the redaction of an old version of a node, while being
   # authorised as a normal user.
   def test_redact_node_normal_user
-    user = create(:user)
-    basic_authorization(user.email, "test")
+    basic_authorization(create(:user).email, "test")
 
     do_redact_node(nodes(:node_with_versions_v3),
-                   create(:redaction, :user => user))
+                   create(:redaction))
     assert_response :forbidden, "should need to be moderator to redact."
   end
 
@@ -208,11 +207,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # test that, even as moderator, the current version of a node
   # can't be redacted.
   def test_redact_node_current_version
-    moderator_user = create(:moderator_user)
-    basic_authorization(moderator_user.email, "test")
+    basic_authorization(create(:moderator_user).email, "test")
 
     do_redact_node(nodes(:node_with_versions_v4),
-                   create(:redaction, :user => moderator_user))
+                   create(:redaction))
     assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
   end
 
@@ -251,11 +249,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # test the redaction of an old version of a node, while being
   # authorised as a moderator.
   def test_redact_node_moderator
-    moderator_user = create(:moderator_user)
     node = nodes(:node_with_versions_v3)
-    basic_authorization(moderator_user.email, "test")
+    basic_authorization(create(:moderator_user).email, "test")
 
-    do_redact_node(node, create(:redaction, :user => moderator_user))
+    do_redact_node(node, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # check moderator can still see the redacted data, when passing
@@ -277,11 +274,10 @@ class OldNodeControllerTest < ActionController::TestCase
   # testing that if the moderator drops auth, he can't see the
   # redacted stuff any more.
   def test_redact_node_is_redacted
-    moderator_user = create(:moderator_user)
     node = nodes(:node_with_versions_v3)
-    basic_authorization(moderator_user.email, "test")
+    basic_authorization(create(:moderator_user).email, "test")
 
-    do_redact_node(node, create(:redaction, :user => moderator_user))
+    do_redact_node(node, create(:redaction))
     assert_response :success, "should be OK to redact old version as moderator."
 
     # re-auth as non-moderator