X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..2df3605142e73ef38c1ad307cbbd5437770b8d96:/test/controllers/redactions_controller_test.rb

diff --git a/test/controllers/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
index 44a760694..3d71012b3 100644
--- a/test/controllers/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'redactions_controller'
+require "test_helper"
+require "redactions_controller"
 
 class RedactionsControllerTest < ActionController::TestCase
   api_fixtures
@@ -37,36 +37,75 @@ class RedactionsControllerTest < ActionController::TestCase
     )
   end
 
-  def test_moderators_can_create
+  def test_index
+    get :index
+    assert_response :success
+    assert_template :index
+    assert_select "ul#redaction_list", 1 do
+      assert_select "li", Redaction.count
+    end
+  end
+
+  def test_new
+    get :new
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => new_redaction_path)
+  end
+
+  def test_new_moderator
+    session[:user] = users(:moderator_user).id
+
+    get :new
+    assert_response :success
+    assert_template :new
+  end
+
+  def test_new_non_moderator
+    session[:user] = users(:public_user).id
+
+    get :new
+    assert_response :redirect
+    assert_redirected_to redactions_path
+  end
+
+  def test_create_moderator
     session[:user] = users(: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_non_moderators_cant_create
+  def test_create_moderator_invalid
+    session[:user] = users(:moderator_user).id
+
+    post :create, :redaction => { :title => "Foo", :description => "" }
+    assert_response :success
+    assert_template :new
+  end
+
+  def test_create_non_moderator
     session[:user] = users(:public_user).id
 
     post :create, :redaction => { :title => "Foo", :description => "Description here." }
     assert_response :forbidden
   end
 
-  def test_moderators_can_delete_empty
+  def test_destroy_moderator_empty
     session[:user] = users(:moderator_user).id
 
     # remove all elements from the redaction
     redaction = redactions(:example)
-    redaction.old_nodes.each     { |n| n.redaction = nil; n.save! }
-    redaction.old_ways.each      { |w| w.redaction = nil; w.save! }
-    redaction.old_relations.each { |r| r.redaction = nil; r.save! }
+    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) }
 
     delete :destroy, :id => redaction.id
     assert_response :redirect
     assert_redirected_to(redactions_path)
   end
 
-  def test_moderators_cant_delete_nonempty
+  def test_destroy_moderator_non_empty
     session[:user] = users(:moderator_user).id
 
     # leave elements in the redaction
@@ -78,21 +117,27 @@ class RedactionsControllerTest < ActionController::TestCase
     assert_match /^Redaction is not empty/, flash[:error]
   end
 
-  def test_non_moderators_cant_delete
+  def test_delete_non_moderator
     session[:user] = users(:public_user).id
 
     delete :destroy, :id => redactions(:example).id
     assert_response :forbidden
   end
 
-  def test_moderators_can_edit
+  def test_edit
+    get :edit, :id => redactions(:example).id
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => edit_redaction_path(redactions(:example)))
+  end
+
+  def test_edit_moderator
     session[:user] = users(:moderator_user).id
 
     get :edit, :id => redactions(:example).id
     assert_response :success
   end
 
-  def test_non_moderators_cant_edit
+  def test_edit_non_moderator
     session[:user] = users(:public_user).id
 
     get :edit, :id => redactions(:example).id
@@ -100,7 +145,7 @@ class RedactionsControllerTest < ActionController::TestCase
     assert_redirected_to(redactions_path)
   end
 
-  def test_moderators_can_update
+  def test_update_moderator
     session[:user] = users(:moderator_user).id
 
     redaction = redactions(:example)
@@ -110,7 +155,17 @@ class RedactionsControllerTest < ActionController::TestCase
     assert_redirected_to(redaction_path(redaction))
   end
 
-  def test_non_moderators_cant_update
+  def test_update_moderator_invalid
+    session[:user] = users(:moderator_user).id
+
+    redaction = redactions(:example)
+
+    put :update, :id => redaction.id, :redaction => { :title => "Foo", :description => "" }
+    assert_response :success
+    assert_template :edit
+  end
+
+  def test_updated_non_moderator
     session[:user] = users(:public_user).id
 
     redaction = redactions(:example)