Add deactivates_at date to user blocks

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

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
index 0c59e14390079e28f9457e2f8d4bd29fb85ab4bc..3d96199f397f56e705eb6ca058ae6f3d4fad5c20 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -13,10 +13,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
       { :path => "/user_blocks", :method => :get },
       { :controller => "user_blocks", :action => "index" }
     )
       { :path => "/user_blocks", :method => :get },
       { :controller => "user_blocks", :action => "index" }
     )

-    assert_routing(
-      { :path => "/user_blocks/new", :method => :get },
-      { :controller => "user_blocks", :action => "new" }
-    )

     assert_routing(
       { :path => "/user_blocks", :method => :post },
       { :controller => "user_blocks", :action => "create" }
     assert_routing(
       { :path => "/user_blocks", :method => :post },
       { :controller => "user_blocks", :action => "create" }


@@ -215,19 +211,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     check_block_buttons block, :edit => 1
   end
 
     check_block_buttons block, :edit => 1
   end
 

-  private
-
-  def check_block_buttons(block, edit: 0, revoke: 0)
-    [user_blocks_path, user_block_path(block)].each do |path|
-      get path
-      assert_response :success
-      assert_select "a[href='#{edit_user_block_path block}']", :count => edit
-      assert_select "a[href='#{revoke_user_block_path block}']", :count => revoke
-    end
-  end
-
-  public
-

   ##
   # test the new action
   def test_new
   ##
   # test the new action
   def test_new


@@ -365,10 +348,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
                             :user_block_period => "12",
                             :user_block => { :needs_view => false, :reason => "Vandalism" })
     end
                             :user_block_period => "12",
                             :user_block => { :needs_view => false, :reason => "Vandalism" })
     end

-    id = UserBlock.order(:id).ids.last
-    assert_redirected_to user_block_path(:id => id)
+    b = UserBlock.last
+    assert_redirected_to user_block_path(:id => b.id)

     assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice]
     assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice]

-    b = UserBlock.find(id)

     assert_in_delta Time.now.utc, b.created_at, 1
     assert_in_delta Time.now.utc, b.updated_at, 1
     assert_in_delta Time.now.utc + 12.hours, b.ends_at, 1
     assert_in_delta Time.now.utc, b.created_at, 1
     assert_in_delta Time.now.utc, b.updated_at, 1
     assert_in_delta Time.now.utc + 12.hours, b.ends_at, 1


@@ -401,7 +383,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
                           :user_block_period => "336",
                           :user_block => { :needs_view => false, :reason => "Vandalism" })
 
                           :user_block_period => "336",
                           :user_block => { :needs_view => false, :reason => "Vandalism" })
 

-    block = UserBlock.order(:id).last
+    block = UserBlock.last

     assert_equal 1209600, block.ends_at - block.created_at
   end
 
     assert_equal 1209600, block.ends_at - block.created_at
   end
 


@@ -483,7 +465,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_equal "Original Reason", block.reason
 
     session_for(creator_user)
     assert_equal "Original Reason", block.reason
 
     session_for(creator_user)

-    check_block_updates(block)
+    check_inactive_block_updates(block)

   end
 
   ##
   end
 
   ##


@@ -505,10 +487,10 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_equal "Original Reason", block.reason
 
     session_for(creator_user)
     assert_equal "Original Reason", block.reason
 
     session_for(creator_user)

-    check_block_updates(block)
+    check_inactive_block_updates(block)

 
     session_for(revoker_user)
 
     session_for(revoker_user)

-    check_block_updates(block)
+    check_inactive_block_updates(block)

   end
 
   ##
   end
 
   ##


@@ -637,6 +619,134 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_not_equal moderator_user, expired_block1.revoker
   end
 
     assert_not_equal moderator_user, expired_block1.revoker
   end
 

+  ##
+  # test changes to end/deactivation dates
+  def test_dates_when_viewed_before_end
+    blocked_user = create(:user)
+    moderator_user = create(:moderator_user)
+
+    freeze_time do
+      session_for(moderator_user)
+      assert_difference "UserBlock.count", 1 do
+        post user_blocks_path(:display_name => blocked_user.display_name,
+                              :user_block_period => "48",
+                              :user_block => { :needs_view => true, :reason => "Testing deactivates_at" })
+      end
+      block = UserBlock.last
+      assert_equal Time.now.utc + 2.days, block.ends_at
+      assert_nil block.deactivates_at
+
+      travel 1.day
+      session_for(blocked_user)
+      get user_block_path(block)
+      block.reload
+      assert_equal Time.now.utc + 1.day, block.ends_at
+      assert_equal Time.now.utc + 1.day, block.deactivates_at
+    end
+  end
+
+  def test_dates_when_viewed_after_end
+    blocked_user = create(:user)
+    moderator_user = create(:moderator_user)
+
+    freeze_time do
+      session_for(moderator_user)
+      assert_difference "UserBlock.count", 1 do
+        post user_blocks_path(:display_name => blocked_user.display_name,
+                              :user_block_period => "24",
+                              :user_block => { :needs_view => true, :reason => "Testing deactivates_at" })
+      end
+      block = UserBlock.last
+      assert_equal Time.now.utc + 1.day, block.ends_at
+      assert_nil block.deactivates_at
+
+      travel 2.days
+      session_for(blocked_user)
+      get user_block_path(block)
+      block.reload
+      assert_equal Time.now.utc - 1.day, block.ends_at
+      assert_equal Time.now.utc, block.deactivates_at
+    end
+  end
+
+  def test_dates_when_edited_before_end
+    blocked_user = create(:user)
+    moderator_user = create(:moderator_user)
+
+    freeze_time do
+      session_for(moderator_user)
+      assert_difference "UserBlock.count", 1 do
+        post user_blocks_path(:display_name => blocked_user.display_name,
+                              :user_block_period => "48",
+                              :user_block => { :needs_view => false, :reason => "Testing deactivates_at" })
+      end
+      block = UserBlock.last
+      assert_equal Time.now.utc + 2.days, block.ends_at
+      assert_equal Time.now.utc + 2.days, block.deactivates_at
+
+      travel 1.day
+      put user_block_path(block,
+                          :user_block_period => "48",
+                          :user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" })
+      block.reload
+      assert_equal Time.now.utc + 2.days, block.ends_at
+      assert_equal Time.now.utc + 2.days, block.deactivates_at
+    end
+  end
+
+  def test_dates_when_edited_after_end
+    blocked_user = create(:user)
+    moderator_user = create(:moderator_user)
+
+    freeze_time do
+      session_for(moderator_user)
+      assert_difference "UserBlock.count", 1 do
+        post user_blocks_path(:display_name => blocked_user.display_name,
+                              :user_block_period => "24",
+                              :user_block => { :needs_view => false, :reason => "Testing deactivates_at" })
+      end
+      block = UserBlock.last
+      assert_equal Time.now.utc + 1.day, block.ends_at
+      assert_equal Time.now.utc + 1.day, block.deactivates_at
+
+      travel 2.days
+      put user_block_path(block,
+                          :user_block_period => "0",
+                          :user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" })
+      block.reload
+      assert_equal Time.now.utc - 1.day, block.ends_at
+      assert_equal Time.now.utc - 1.day, block.deactivates_at
+    end
+  end
+
+  ##
+  # test updates on legacy records without correctly initialized deactivates_at
+  def test_update_legacy_deactivates_at
+    blocked_user = create(:user)
+    moderator_user = create(:moderator_user)
+
+    freeze_time do
+      block = UserBlock.new :user => blocked_user,
+                            :creator => moderator_user,
+                            :reason => "because",
+                            :ends_at => Time.now.utc + 1.day,
+                            :needs_view => false
+
+      assert_difference "UserBlock.count", 1 do
+        block.save :validate => false
+      end
+
+      travel 2.days
+      session_for(moderator_user)
+      put user_block_path(block,
+                          :user_block_period => "0",
+                          :user_block => { :needs_view => false, :reason => "Testing legacy block update" })
+      block.reload
+      assert_equal Time.now.utc - 1.day, block.ends_at
+      assert_equal Time.now.utc - 1.day, block.deactivates_at
+    end
+  end
+

   ##
   # test the blocks_on action
   def test_blocks_on
   ##
   # test the blocks_on action
   def test_blocks_on


@@ -803,7 +913,18 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
   private
 
 
   private
 

-  def check_block_updates(block)
+  def check_block_buttons(block, edit: 0, revoke: 0)
+    [user_blocks_path, user_block_path(block)].each do |path|
+      get path
+      assert_response :success
+      assert_select "a[href='#{edit_user_block_path block}']", :count => edit
+      assert_select "a[href='#{revoke_user_block_path block}']", :count => revoke
+    end
+  end
+
+  def check_inactive_block_updates(block)
+    original_ends_at = block.ends_at
+

     put user_block_path(block,
                         :user_block_period => "0",
                         :user_block => { :needs_view => false, :reason => "Updated Reason" })
     put user_block_path(block,
                         :user_block_period => "0",
                         :user_block => { :needs_view => false, :reason => "Updated Reason" })


@@ -812,15 +933,37 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     block.reload
     assert_not_predicate block, :active?
     assert_equal "Updated Reason", block.reason
     block.reload
     assert_not_predicate block, :active?
     assert_equal "Updated Reason", block.reason

+    assert_equal original_ends_at, block.ends_at

 
     put user_block_path(block,
                         :user_block_period => "0",
 
     put user_block_path(block,
                         :user_block_period => "0",

-                        :user_block => { :needs_view => true, :reason => "Updated Reason 2" })
+                        :user_block => { :needs_view => true, :reason => "Updated Reason Needs View" })
+    assert_response :success
+    assert_equal "This block is inactive and cannot be reactivated.", flash[:error]
+    block.reload
+    assert_not_predicate block, :active?
+    assert_equal "Updated Reason", block.reason
+    assert_equal original_ends_at, block.ends_at
+
+    put user_block_path(block,
+                        :user_block_period => "1",
+                        :user_block => { :needs_view => false, :reason => "Updated Reason Duration Extended" })
+    assert_response :success
+    assert_equal "This block is inactive and cannot be reactivated.", flash[:error]
+    block.reload
+    assert_not_predicate block, :active?
+    assert_equal "Updated Reason", block.reason
+    assert_equal original_ends_at, block.ends_at
+
+    put user_block_path(block,
+                        :user_block_period => "0",
+                        :user_block => { :needs_view => false, :reason => "Updated Reason Again" })

     assert_redirected_to user_block_path(block)
     assert_equal "Block updated.", flash[:notice]
     block.reload
     assert_redirected_to user_block_path(block)
     assert_equal "Block updated.", flash[:notice]
     block.reload

-    assert_predicate block, :active?
-    assert_equal "Updated Reason 2", block.reason
+    assert_not_predicate block, :active?
+    assert_equal "Updated Reason Again", block.reason
+    assert_equal original_ends_at, block.ends_at

   end
 
   def check_user_blocks_table(user_blocks)
   end
 
   def check_user_blocks_table(user_blocks)