https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112568
Revision: 112568
Author: aaron
Date: 2012-02-28 02:40:31 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112566
Modified Paths:
--------------
branches/wmf/1.19wmf1/tests/phpunit/includes/BlockTest.php
branches/wmf/1.19wmf1/tests/phpunit/includes/TitlePermissionTest.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112374,112378,112381,112383,112397,112408,112474,112526,112533-112534,112563,112566
Modified: branches/wmf/1.19wmf1/tests/phpunit/includes/BlockTest.php
===================================================================
--- branches/wmf/1.19wmf1/tests/phpunit/includes/BlockTest.php 2012-02-28
02:36:29 UTC (rev 112567)
+++ branches/wmf/1.19wmf1/tests/phpunit/includes/BlockTest.php 2012-02-28
02:40:31 UTC (rev 112568)
@@ -35,7 +35,7 @@
$oldBlock->delete();
}
- $this->block = new Block( 'UTBlockee', 1, 0,
+ $this->block = new Block( 'UTBlockee', $user->getID(), 0,
'Parce que', 0, false, time() + 100500
);
$this->madeAt = wfTimestamp( TS_MW );
Modified: branches/wmf/1.19wmf1/tests/phpunit/includes/TitlePermissionTest.php
===================================================================
--- branches/wmf/1.19wmf1/tests/phpunit/includes/TitlePermissionTest.php
2012-02-28 02:36:29 UTC (rev 112567)
+++ branches/wmf/1.19wmf1/tests/phpunit/includes/TitlePermissionTest.php
2012-02-28 02:40:31 UTC (rev 112568)
@@ -629,7 +629,7 @@
$prev = time();
$now = time() + 120;
$this->user->mBlockedby = $this->user->getId();
- $this->user->mBlock = new Block( '127.0.8.1',
$this->user->getId(), $this->user->getId(),
+ $this->user->mBlock = new Block( '127.0.8.1', 0,
$this->user->getId(),
'no reason given', $prev + 3600, 1, 0 );
$this->user->mBlock->mTimestamp = 0;
$this->assertEquals( array( array( 'autoblockedtext',
@@ -646,7 +646,7 @@
global $wgLocalTZoffset;
$wgLocalTZoffset = -60;
$this->user->mBlockedby = $this->user->getName();
- $this->user->mBlock = new Block( '127.0.8.1', 2, 1, 'no reason
given', $now, 0, 10 );
+ $this->user->mBlock = new Block( '127.0.8.1', 0, 1, 'no reason
given', $now, 0, 10 );
$this->assertEquals( array( array( 'blockedtext',
'[[User:Useruser|Useruser]]', 'no reason given',
'127.0.0.1',
'Useruser', null, '23:00, 31 December 1969',
'127.0.8.1',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
