X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f6695c9079f4eeeecaa796c879868f797f97cd55..8da385e0db1d56a5cfc1d7355960f43ab8958927:/test/controllers/redactions_controller_test.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 3d71012b3..5a72830e4 100644
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -53,7 +53,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_new_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     get :new
     assert_response :success
@@ -61,7 +61,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_new_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
     get :new
     assert_response :redirect
@@ -69,7 +69,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_create_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     post :create, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :redirect
@@ -77,7 +77,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_create_moderator_invalid
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     post :create, :redaction => { :title => "Foo", :description => "" }
     assert_response :success
@@ -85,20 +85,17 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_create_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
     post :create, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :forbidden
   end
 
   def test_destroy_moderator_empty
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
-    # remove all elements from the redaction
-    redaction = redactions(:example)
-    redaction.old_nodes.each     { |n| n.update!(:redaction => nil) }
-    redaction.old_ways.each      { |w| w.update!(:redaction => nil) }
-    redaction.old_relations.each { |r| r.update!(:redaction => nil) }
+    # create an empty redaction
+    redaction = create(:redaction)
 
     delete :destroy, :id => redaction.id
     assert_response :redirect
@@ -106,10 +103,11 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_destroy_moderator_non_empty
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
-    # leave elements in the redaction
-    redaction = redactions(:example)
+    # create elements in the redaction
+    redaction = create(:redaction)
+    create(:old_node, :redaction => redaction)
 
     delete :destroy, :id => redaction.id
     assert_response :redirect
@@ -118,37 +116,39 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_delete_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
-    delete :destroy, :id => redactions(:example).id
+    delete :destroy, :id => create(:redaction).id
     assert_response :forbidden
   end
 
   def test_edit
-    get :edit, :id => redactions(:example).id
+    redaction = create(:redaction)
+
+    get :edit, :id => redaction.id
     assert_response :redirect
-    assert_redirected_to login_path(:referer => edit_redaction_path(redactions(:example)))
+    assert_redirected_to login_path(:referer => edit_redaction_path(redaction))
   end
 
   def test_edit_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
-    get :edit, :id => redactions(:example).id
+    get :edit, :id => create(:redaction).id
     assert_response :success
   end
 
   def test_edit_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
-    get :edit, :id => redactions(:example).id
+    get :edit, :id => create(:redaction).id
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
 
   def test_update_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :redirect
@@ -156,9 +156,9 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_update_moderator_invalid
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
     assert_response :success
@@ -166,9 +166,9 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_updated_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
-    redaction = redactions(:example)
+    redaction = create(:redaction)
 
     put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :forbidden