Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/314181

Change subject: Merge branch 'master' into deployment
......................................................................

Merge branch 'master' into deployment

And delete tests

4277df8 Fix Class undefined: TESTS_ADAPTER_DEFAULT
4722c24 Localisation updates from https://translatewiki.net.
f7add42 Enable Adyen for credit cards in GB

Change-Id: If5397fb6f7cbcb0a87e32413035e3f1bcd366457
---
D tests/phpunit/AllTests.php
1 file changed, 0 insertions(+), 42 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/81/314181/1

diff --git a/tests/phpunit/AllTests.php b/tests/phpunit/AllTests.php
deleted file mode 100644
index d611b89..0000000
--- a/tests/phpunit/AllTests.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<<<<<<< HEAD   (3937e2 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-/**
- * Suite containing all DonationInterface test cases
- *
- * @see DonationInterface_Adapter_AllTests
- */
-class DonationInterface_AllTests extends PHPUnit_Framework_TestSuite {
-       function __construct() {
-               parent::__construct( 'DonationInterface test suite' );
-
-               $suffixes = array(
-                       'Test.php',
-               );
-               $fileIterator = new File_Iterator_Facade();
-               $files = $fileIterator->getFilesAsArray( __DIR__, $suffixes );
-               $this->addTestFiles( $files );
-       }
-
-       public static function suite() {
-               return new self();
-       }
-}
->>>>>>> BRANCH (f7add4 Enable Adyen for credit cards in GB)

-- 
To view, visit https://gerrit.wikimedia.org/r/314181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5397fb6f7cbcb0a87e32413035e3f1bcd366457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to