X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..912da4fc1ed4c0a68beb2850f0f404ce8082cad0:/test/controllers/redactions_controller_test.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 1df2a6dff..c5678a5c8 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,15 +69,15 @@ 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
-    assert_redirected_to(redaction_path(Redaction.find_by_title("Foo")))
+    assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   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,14 +85,14 @@ 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)
@@ -106,7 +106,7 @@ 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)
@@ -118,7 +118,7 @@ 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
     assert_response :forbidden
@@ -131,14 +131,14 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_edit_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     get :edit, :id => redactions(:example).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
     assert_response :redirect
@@ -146,7 +146,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_update_moderator
-    session[:user] = users(:moderator_user).id
+    session[:user] = create(:moderator_user).id
 
     redaction = redactions(:example)
 
@@ -156,7 +156,7 @@ 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)
 
@@ -166,7 +166,7 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_updated_non_moderator
-    session[:user] = users(:public_user).id
+    session[:user] = create(:user).id
 
     redaction = redactions(:example)