From 2dd3e49638ef61ea6743571cd98abff4ca6e3613 Mon Sep 17 00:00:00 2001 From: webchick <webchick@24967.no-reply.drupal.org> Date: Sat, 7 Jul 2012 13:42:34 -0700 Subject: [PATCH] Issue #1621548 by tedstein, droplet, mjonesdinero, bendev, disasm: Fixed User status should not default to blocked. --- .../user/lib/Drupal/user/Tests/UserCreateTest.php | 13 ++++++++++++- core/modules/user/lib/Drupal/user/User.php | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php index cfa725443ec8..f72812337f49 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php @@ -30,9 +30,18 @@ protected function testUserAdd() { $user = $this->drupalCreateUser(array('administer users')); $this->drupalLogin($user); + // Test user creation page for valid fields. + $this->drupalGet('admin/people/create'); + $this->assertFieldbyId('edit-status-0', 0, 'The user status option Blocked exists.', 'User login'); + $this->assertFieldbyId('edit-status-1', 1, 'The user status option Active exists.', 'User login'); + $this->assertFieldByXPath('//input[@type="radio" and @id="edit-status-1" and @checked="checked"]', NULL, 'Default setting for user status is active.'); + + // We create two users, notifying one and not notifying the other, to + // ensure that the tests work in both cases. foreach (array(FALSE, TRUE) as $notify) { + $name = $this->randomName(); $edit = array( - 'name' => $this->randomName(), + 'name' => $name, 'mail' => $this->randomName() . '@example.com', 'pass[pass1]' => $pass = $this->randomString(), 'pass[pass2]' => $pass, @@ -51,6 +60,8 @@ protected function testUserAdd() { $this->drupalGet('admin/people'); $this->assertText($edit['name'], 'User found in list of users'); + $user = user_load_by_name($name); + $this->assertEqual($user->status == 1, 'User is not blocked'); } } } diff --git a/core/modules/user/lib/Drupal/user/User.php b/core/modules/user/lib/Drupal/user/User.php index 992923c8634c..382d3d75e4a8 100644 --- a/core/modules/user/lib/Drupal/user/User.php +++ b/core/modules/user/lib/Drupal/user/User.php @@ -91,7 +91,7 @@ class User extends Entity { * * @var integer */ - public $status = 0; + public $status = 1; /** * The user's timezone. -- GitLab