Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.101
diff -u -p -r1.101 user.test
--- modules/user/user.test	27 Aug 2010 11:28:45 -0000	1.101
+++ modules/user/user.test	31 Aug 2010 11:09:28 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: user.test,v 1.101 2010/08/27 11:28:45 webchick Exp $
+// $Id: user.test,v 1.100 2010/08/05 23:53:39 webchick Exp $
 
 class UserRegistrationTestCase extends DrupalWebTestCase {
   public static function getInfo() {
@@ -29,6 +29,7 @@ class UserRegistrationTestCase extends D
     $accounts = user_load_multiple(array(), array('name' => $name, 'mail' => $mail));
     $new_user = reset($accounts);
     $this->assertTrue($new_user->status, t('New account is active after registration.'));
+    $this->assertMailString('body', 'user/reset/' . $new_user->uid, 1);
 
     // Allow registration by site visitors, but require administrator approval.
     variable_set('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL);
@@ -1077,33 +1078,38 @@ class UserAdminTestCase extends DrupalWe
 
     // Test blocking of a user.
     $account = user_load($user_c->uid);
-    $this->assertEqual($account->status, 1, 'User C not blocked');
+    $this->assertEqual($account->status, 1, t('User C not blocked'));
     $edit = array();
     $edit['operation'] = 'block';
     $edit['accounts[' . $account->uid . ']'] = TRUE;
     $this->drupalPost('admin/people', $edit, t('Update'));
     $account = user_load($user_c->uid, TRUE);
-    $this->assertEqual($account->status, 0, 'User C blocked');
+    $this->assertEqual($account->status, 0, t('User C blocked'));
 
-    // Test unblocking of a user from /admin/people page and sending of activation mail
+    // Test unblocking of a user from /admin/people page, sending of activation
+    // mail and whether the mail contains an activation link.
     $editunblock = array();
     $editunblock['operation'] = 'unblock';
     $editunblock['accounts[' . $account->uid . ']'] = TRUE;
     $this->drupalPost('admin/people', $editunblock, t('Update'));
     $account = user_load($user_c->uid, TRUE);
-    $this->assertEqual($account->status, 1, 'User C unblocked');
-    $this->assertMail("to", $account->mail, "Activation mail sent to user C");
-
-    // Test blocking and unblocking another user from /user/[uid]/edit form and sending of activation mail
+    $this->assertEqual($account->status, 1, t('User C not blocked'));
+    $this->assertMail('to', $account->mail, t('Activation mail sent to user C'));
+    $this->assertMailString('body', 'user/reset/' . $account->uid, 1);
+
+    // Test blocking and unblocking another user from /user/[uid]/edit form,
+    // sending of activation mail and whether the mail contains an activation
+    // link.
     $user_d = $this->drupalCreateUser(array());
     $account1 = user_load($user_d->uid, TRUE);
     $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => 0), t('Save'));
     $account1 = user_load($user_d->uid, TRUE);
-    $this->assertEqual($account1->status, 0, 'User D blocked');
+    $this->assertEqual($account1->status, 0, t('User D blocked'));
     $this->drupalPost('user/' . $account1->uid . '/edit', array('status' => TRUE), t('Save'));
     $account1 = user_load($user_d->uid, TRUE);
-    $this->assertEqual($account1->status, 1, 'User D unblocked');
-    $this->assertMail("to", $account1->mail, "Activation mail sent to user D");
+    $this->assertEqual($account1->status, 1, t('User D not blocked'));
+    $this->assertMail('to', $account1->mail, t('Activation mail sent to user D'));
+    $this->assertMailString('body', 'user/reset/' . $account1->uid, 1);
   }
 }