Merge remote-tracking branch 'upstream/pull/2053'

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

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index c5678a5c845bc9ba8a23ca13b3f39a58075b0b36..0bf57c3102c7b9f982fc1d4dbf3cce4243516416 100644 (file)
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,9 +1,6 @@
 require "test_helper"
 require "test_helper"

-require "redactions_controller"

 
 class RedactionsControllerTest < ActionController::TestCase
 
 class RedactionsControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -38,6 +35,8 @@ class RedactionsControllerTest < ActionController::TestCase
   end
 
   def test_index
   end
 
   def test_index

+    create(:redaction)
+

     get :index
     assert_response :success
     assert_template :index
     get :index
     assert_response :success
     assert_template :index


@@ -71,7 +70,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_moderator
     session[:user] = create(:moderator_user).id
 
   def test_create_moderator
     session[:user] = create(:moderator_user).id
 

-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }

     assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end
     assert_response :redirect
     assert_redirected_to(redaction_path(Redaction.find_by(:title => "Foo")))
   end


@@ -79,7 +78,7 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_moderator_invalid
     session[:user] = create(:moderator_user).id
 
   def test_create_moderator_invalid
     session[:user] = create(:moderator_user).id
 

-    post :create, :redaction => { :title => "Foo", :description => "" }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "" } }

     assert_response :success
     assert_template :new
   end
     assert_response :success
     assert_template :new
   end


@@ -87,20 +86,17 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_create_non_moderator
     session[:user] = create(:user).id
 
   def test_create_non_moderator
     session[:user] = create(:user).id
 

-    post :create, :redaction => { :title => "Foo", :description => "Description here." }
+    post :create, :params => { :redaction => { :title => "Foo", :description => "Description here." } }

     assert_response :forbidden
   end
 
   def test_destroy_moderator_empty
     session[:user] = create(:moderator_user).id
 
     assert_response :forbidden
   end
 
   def test_destroy_moderator_empty
     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
+    delete :destroy, :params => { :id => redaction.id }

     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end


@@ -108,39 +104,42 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_destroy_moderator_non_empty
     session[:user] = create(:moderator_user).id
 
   def test_destroy_moderator_non_empty
     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
+    delete :destroy, :params => { :id => redaction.id }

     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))

-    assert_match /^Redaction is not empty/, flash[:error]
+    assert_match(/^Redaction is not empty/, flash[:error])

   end
 
   def test_delete_non_moderator
     session[:user] = create(:user).id
 
   end
 
   def test_delete_non_moderator
     session[:user] = create(:user).id
 

-    delete :destroy, :id => redactions(:example).id
+    delete :destroy, :params => { :id => create(:redaction).id }

     assert_response :forbidden
   end
 
   def test_edit
     assert_response :forbidden
   end
 
   def test_edit

-    get :edit, :id => redactions(:example).id
+    redaction = create(:redaction)
+
+    get :edit, :params => { :id => redaction.id }

     assert_response :redirect
     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] = create(:moderator_user).id
 
   end
 
   def test_edit_moderator
     session[:user] = create(:moderator_user).id
 

-    get :edit, :id => redactions(:example).id
+    get :edit, :params => { :id => create(:redaction).id }

     assert_response :success
   end
 
   def test_edit_non_moderator
     session[:user] = create(:user).id
 
     assert_response :success
   end
 
   def test_edit_non_moderator
     session[:user] = create(:user).id
 

-    get :edit, :id => redactions(:example).id
+    get :edit, :params => { :id => create(:redaction).id }

     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end


@@ -148,9 +147,9 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_update_moderator
     session[:user] = create(:moderator_user).id
 
   def test_update_moderator
     session[:user] = create(:moderator_user).id
 

-    redaction = redactions(:example)
+    redaction = create(:redaction)

 
 

-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }

     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end
     assert_response :redirect
     assert_redirected_to(redaction_path(redaction))
   end


@@ -158,9 +157,9 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_update_moderator_invalid
     session[:user] = create(:moderator_user).id
 
   def test_update_moderator_invalid
     session[:user] = create(:moderator_user).id
 

-    redaction = redactions(:example)
+    redaction = create(:redaction)

 
 

-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "" } }

     assert_response :success
     assert_template :edit
   end
     assert_response :success
     assert_template :edit
   end


@@ -168,9 +167,9 @@ class RedactionsControllerTest < ActionController::TestCase
   def test_updated_non_moderator
     session[:user] = create(:user).id
 
   def test_updated_non_moderator
     session[:user] = create(:user).id
 

-    redaction = redactions(:example)
+    redaction = create(:redaction)

 
 

-    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." }
+    put :update, :params => { :id => redaction.id, :redaction => { :title => "Foo", :description => "Description here." } }

     assert_response :forbidden
   end
 end
     assert_response :forbidden
   end
 end