wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 17:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Unbreak the unit tests"

Browse source
This commit is contained in:
jenkins-bot 2013-11-01 08:22:35 +00:00 committed by Gerrit Code Review
parent 692f594ba1 61f1754d14
commit 18c9faaf10
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/EmailFormatterTest.php
View file

@ -19,10 +19,10 @@ class EchoEmailFormatterTest extends MediaWikiTestCase {
$formatter = EchoNotificationFormatter::factory( $wgEchoNotifications[$event->getType()] ); $formatter = EchoNotificationFormatter::factory( $wgEchoNotifications[$event->getType()] );
$formatter->setOutputFormat( 'email' ); $formatter->setOutputFormat( 'email' );
$user = User::newFromId( 2 ); $user = User::newFromId( 1 );
$user->setName( 'Test' ); $user->setName( 'Test' );
$user->setOption( 'echo-email-format', EchoHooks::EMAIL_FORMAT_HTML ); $user->setOption( 'echo-email-format', EchoHooks::EMAIL_FORMAT_HTML );
$this->emailSingle = new EchoEmailSingle( $formatter, $event, $user ); $this->emailSingle = new EchoEmailSingle( $formatter, $event, $user );
$content[$event->getCategory()][] = EchoNotificationController::formatNotification( $event, $user, 'email', 'emaildigest' ); $content[$event->getCategory()][] = EchoNotificationController::formatNotification( $event, $user, 'email', 'emaildigest' );

24
tests/NotificationFormatterTest.php
View file

@ -2,6 +2,14 @@
class EchoNotificationFormatterTest extends MediaWikiTestCase { class EchoNotificationFormatterTest extends MediaWikiTestCase {
public function setUp() {
parent::setUp();
$user = new User();
$user->setName( 'Notification-formatter-test' );
$user->addToDatabase();
$this->setMwGlobals( 'wgUser', $user );
}
public static function provider_editUserTalkEmail() { public static function provider_editUserTalkEmail() {
return array( return array(
array( '/Main_Page[^#]/', null ), array( '/Main_Page[^#]/', null ),
@ -31,7 +39,7 @@ class EchoNotificationFormatterTest extends MediaWikiTestCase {
public static function provider_editUserTalk() { public static function provider_editUserTalk() {
return array( return array(
// if there is a section-title, the message should be '[[User:user_name|user_name]] left a message on // if there is a section-title, the message should be '[[User:user_name|user_name]] left a message on
// your talk page in '[[User talk:user_name#section_title|section_title]]' // your talk page in '[[User talk:user_name#section_title|section_title]]'
array( '/[[User talk:[^#]+#moar_cowbell|moar_cowbell]]/', 'moar_cowbell', 'text' ), array( '/[[User talk:[^#]+#moar_cowbell|moar_cowbell]]/', 'moar_cowbell', 'text' ),
array( '/#moar_cowbell/', 'moar_cowbell', 'html' ), array( '/#moar_cowbell/', 'moar_cowbell', 'html' ),
array( '/#moar_cowbell/', 'moar_cowbell', 'flyout' ), array( '/#moar_cowbell/', 'moar_cowbell', 'flyout' ),
@ -43,12 +51,12 @@ class EchoNotificationFormatterTest extends MediaWikiTestCase {
*/ */
public function testEditUserTalkFlyoutSectionLinkFragment( $pattern, $sectionTitle, $format ) { public function testEditUserTalkFlyoutSectionLinkFragment( $pattern, $sectionTitle, $format ) {
// Required hack so parser doesnt turn the links into redlinks which contain no fragment // Required hack so parser doesnt turn the links into redlinks which contain no fragment
LinkCache::singleton()->addGoodLinkObj( 42, Title::newFromText( '127.0.0.1', NS_USER_TALK ) ); global $wgUser;
LinkCache::singleton()->addGoodLinkObj( 42, $wgUser->getTalkPage() );
$event = $this->mockEvent( 'edit-user-talk', array( $event = $this->mockEvent( 'edit-user-talk', array(
'section-title' => $sectionTitle, 'section-title' => $sectionTitle,
) ); ) );
$this->assertRegExp( $pattern, $this->format( $event, $format ) ); $this->assertRegExp( $pattern, $this->format( $event, $format ) );
} }
@ -121,7 +129,7 @@ class EchoNotificationFormatterTest extends MediaWikiTestCase {
$this->assertContains( $text, $this->format( $event, 'html' ) ); $this->assertContains( $text, $this->format( $event, 'html' ) );
} }
} }
public static function provider_revisionAgent() { public static function provider_revisionAgent() {
$userText = '10.2.3.4'; $userText = '10.2.3.4';
$suppressed = wfMessage( 'rev-deleted-user' )->text(); $suppressed = wfMessage( 'rev-deleted-user' )->text();
@ -198,15 +206,19 @@ class EchoNotificationFormatterTest extends MediaWikiTestCase {
$this->assertContains( $expect, $this->format( $event, 'html' ) ); $this->assertContains( $expect, $this->format( $event, 'html' ) );
} }
protected function format( EchoEvent $event, $format, $type = 'web', array $params = array() ) { protected function format( EchoEvent $event, $format, $user = false, $type = 'web', array $params = array() ) {
global $wgEchoNotifications; global $wgEchoNotifications;
$params += $wgEchoNotifications[ $event->getType() ]; $params += $wgEchoNotifications[ $event->getType() ];
$formatter = EchoNotificationFormatter::factory( $params ); $formatter = EchoNotificationFormatter::factory( $params );
$formatter->setOutputFormat( $format ); $formatter->setOutputFormat( $format );
if ( $user === false ) {
$user = User::newFromName('Notification-formatter-test');
}
// Notification users can not be anonymous, use a fake user id // Notification users can not be anonymous, use a fake user id
return $formatter->format( $event, User::newFromId( 2 ), $type ); return $formatter->format( $event, $user, $type );
} }
protected function mockEvent( $type, array $extra = array(), Revision $rev = null ) { protected function mockEvent( $type, array $extra = array(), Revision $rev = null ) {