Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354264 )
Change subject: Use test user helper methods in UserGroupMembershipTest/UserTest
......................................................................
Use test user helper methods in UserGroupMembershipTest/UserTest
This avoids postgres failures when trying to insert users with name
"false" (cast to 0, which fails since integer != text type).
Change-Id: I809edd94117811d22492eaba440fad6aaea1195b
---
M includes/user/User.php
M tests/phpunit/includes/user/UserGroupMembershipTest.php
M tests/phpunit/includes/user/UserTest.php
3 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/354264/1
diff --git a/includes/user/User.php b/includes/user/User.php
index 5dd4be1..3317a1b 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -4170,6 +4170,10 @@
$this->setToken(); // init token
}
+ if ( !is_string( $this->mName ) ) {
+ throw new RuntimeException( "User name field is not
set." );
+ }
+
$this->mTouched = $this->newTouchedTimestamp();
$noPass = PasswordFactory::newInvalidPassword()->toString();
diff --git a/tests/phpunit/includes/user/UserGroupMembershipTest.php
b/tests/phpunit/includes/user/UserGroupMembershipTest.php
index a297f29..c0e556b 100644
--- a/tests/phpunit/includes/user/UserGroupMembershipTest.php
+++ b/tests/phpunit/includes/user/UserGroupMembershipTest.php
@@ -50,8 +50,7 @@
* @covers UserGroupMembership::delete
*/
public function testAddAndRemoveGroups() {
- $user = new User;
- $user->addToDatabase();
+ $user = $this->getMutableTestUser( [] )->getUser();
// basic tests
$ugm = new UserGroupMembership( $user->getId(), 'unittesters' );
diff --git a/tests/phpunit/includes/user/UserTest.php
b/tests/phpunit/includes/user/UserTest.php
index a596851..bc4d53d 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -25,9 +25,7 @@
$this->setUpPermissionGlobals();
- $this->user = new User;
- $this->user->addToDatabase();
- $this->user->addGroup( 'unittesters' );
+ $this->user = $this->getTestUser( [ 'unittesters' ]
)->getUser();
}
private function setUpPermissionGlobals() {
@@ -100,10 +98,7 @@
* @covers User::getRights
*/
public function testUserGetRightsHooks() {
- $user = new User;
- $user->addToDatabase();
- $user->addGroup( 'unittesters' );
- $user->addGroup( 'testwriters' );
+ $user = $this->getTestUser( [ 'unittesters', 'testwriters']
)->getUser();
$userWrapper = TestingAccessWrapper::newFromObject( $user );
$rights = $user->getRights();
--
To view, visit https://gerrit.wikimedia.org/r/354264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I809edd94117811d22492eaba440fad6aaea1195b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
