jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
And delete tests
e288e71 return value for TestMailer::send
705666f Speed up ty date update
Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
---
D sites/all/modules/wmf_communication/tests/TestMailer.php
1 file changed, 0 insertions(+), 34 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_communication/tests/TestMailer.php
b/sites/all/modules/wmf_communication/tests/TestMailer.php
deleted file mode 100644
index 226b2f5..0000000
--- a/sites/all/modules/wmf_communication/tests/TestMailer.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<<<<<<< HEAD (9d462b Merge branch 'master' into deployment)
-=======
-<?php
-namespace wmf_communication;
-
-class TestMailer implements IMailer {
- static protected $mailings;
- static protected $success = true;
-
- static public function setup() {
- Mailer::$defaultSystem = 'test';
-
- self::$mailings = array();
- self::$success = true;
- }
-
- static public function setSuccess( $success ) {
- self::$success = $success;
- }
-
- public function send( $email ) {
- self::$mailings[] = $email;
- return self::$success;
- }
-
- static public function countMailings() {
- return count( self::$mailings );
- }
-
- static public function getMailing( $index ) {
- return self::$mailings[$index];
- }
-}
->>>>>>> BRANCH (9f3964 Merge "Speed up ty date update")
--
To view, visit https://gerrit.wikimedia.org/r/322719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9978dc5fc57db3bec08931c28ce6e1cbf608f34
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
