ENH: refs #0340. Test correct passing of user id for user deletion

Author: zachmullen

core/controllers/UserController.php

@@ -843,7 +843,10 @@ public function deleteAction()
       // log out if user is deleting his or her own account
       $this->userSession->Dao = null;
       Zend_Session::ForgetMe();
-      setcookie('midasUtil', null, time() + 60 * 60 * 24 * 30, '/');
+      if(!$this->isTestingEnv())
+        {
+        setcookie('midasUtil', null, time() + 60 * 60 * 24 * 30, '/');
+        }
       }
     $this->_helper->viewRenderer->setNoRender();
     $this->disableLayout();

core/tests/controllers/UserControllerTest.php

@@ -282,6 +282,7 @@ public function testDeleteUserAction()
     // Render the delete dialog and make sure it has correct text
     $this->resetAll();
     $this->dispatchUrI('/user/deletedialog?userId='.$user1->getKey(), $adminUser);
+    $this->assertQuery('input[type="hidden"][name="userId"][value="'.$user1->getKey().'"]');
     $this->assertQueryContentContains('#deleteDialogUserName', $user1->getFirstname().' '.$user1->getLastname());
 
     // Should fail if we aren't logged in
@@ -339,6 +340,7 @@ public function testDeleteSelfAction()
     // Render the delete dialog and make sure it has correct text for self-deletion
     $this->resetAll();
     $this->dispatchUrI('/user/deletedialog?userId='.$user1->getKey(), $user1);
+    $this->assertQuery('input[type="hidden"][name="userId"][value="'.$user1->getKey().'"]');
     $this->assertTrue(strpos($this->getBody(), 'Are you sure you want to delete your user account?') !== false);
 
     $oldRevisions = $user1->getItemrevisions();