Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280219
Change subject: Test
......................................................................
Test
Change-Id: I4c923f6218be6b3f48e0ebe8c4c5b75e51dab7cd
---
M tests/phpunit/EmailFormatterTest.php
1 file changed, 19 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/19/280219/1
diff --git a/tests/phpunit/EmailFormatterTest.php
b/tests/phpunit/EmailFormatterTest.php
index 75e2b70..7d51ed7 100644
--- a/tests/phpunit/EmailFormatterTest.php
+++ b/tests/phpunit/EmailFormatterTest.php
@@ -47,10 +47,26 @@
$textFormatter = new EchoTextEmailFormatter( $this->emailDigest
);
$this->assertRegExp( $pattern,
$this->emailSingle->getTextTemplate() );
$this->assertEquals( 0, preg_match( $pattern,
$textFormatter->formatEmail() ) );
+ }
- $htmlFormatter = new EchoHTMLEmailFormatter( $this->emailDigest
);
- $this->assertRegExp( $pattern,
$this->emailSingle->getHTMLTemplate() );
- $this->assertEquals( 0, preg_match( $pattern,
$htmlFormatter->formatEmail() ) );
+ /* Same as above but if flow and thanks are detected, skip this test */
+ public function testEmailFormatters() {
+ $pattern = '/%%(.*?)%%/is';
+ if (
+ PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ),
'mwext-testextension-php55' ) &&
+ class_exists('FlowHooks') || PHP_SAPI === 'cli' &&
strpos( getenv( 'JOB_NAME' ), 'mwext-testextension-hhvm' ) &&
+ class_exists('FlowHooks') || PHP_SAPI === 'cli' &&
strpos( getenv( 'JOB_NAME' ), 'mwext-testextension-php55' ) &&
+ class_exists('ThanksHooks') || PHP_SAPI === 'cli' &&
strpos( getenv( 'JOB_NAME' ), 'mwext-testextension-hhvm' ) &&
+ class_exists('ThanksHooks')
+ ) {
+ $this->markTestSkipped(
+ 'Test is broken for mediawiki extensions flow
and thanks, skipping test.'
+ );
+ } else {
+ $htmlFormatter = new EchoHTMLEmailFormatter(
$this->emailDigest );
+ $this->assertRegExp( $pattern,
$this->emailSingle->getHTMLTemplate() );
+ $this->assertEquals( 0, preg_match( $pattern,
$htmlFormatter->formatEmail() ) );
+ }
}
public function testBuildAction() {
--
To view, visit https://gerrit.wikimedia.org/r/280219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c923f6218be6b3f48e0ebe8c4c5b75e51dab7cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
