Updated so tests are in the root directory

This commit is contained in:
Joshua Estes 2014-07-21 11:10:36 -04:00
parent 41baf4d8d7
commit 2593183300
4 changed files with 5 additions and 12 deletions

1
.gitattributes vendored
View File

@ -29,5 +29,4 @@
.travis.yml export-ignore
build.xml export-ignore
composer.json export-ignore
/tests export-ignore
modman export-ignore

View File

@ -27,7 +27,7 @@
<phpunit
backupGlobals = "false"
backupStaticAttributes = "false"
bootstrap = "magento/app/code/community/Bitpay/Bitcoins/tests/bootstrap.php"
bootstrap = "../tests/bootstrap.php"
colors = "true"
convertErrorsToExceptions = "true"
convertNoticesToExceptions = "true"
@ -39,17 +39,14 @@
<testsuites>
<testsuite name="bitpay/magento-plugin Test Suite">
<directory>magento/app/code/community/Bitpay/Bitcoins/tests/</directory>
<directory>../tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>magento/app/code/community/Bitpay/Bitcoins/</directory>
<directory>magento/lib/bitpay</directory>
<exclude>
<directory>magento/app/code/community/Bitpay/Bitcoins/tests</directory>
</exclude>
<directory>../app/code/community/Bitpay/Bitcoins/</directory>
<directory>../lib/bitpay</directory>
</whitelist>
</filter>

View File

@ -24,10 +24,7 @@
* THE SOFTWARE.
*/
if ($mage = realpath(__DIR__ . '/../../../../../Mage.php')) {
require_once $mage;
Mage::app();
} elseif ($mage = realpath(__DIR__ . '/../../../../../../build/magento/app/Mage.php')) {
if ($mage = realpath(__DIR__ . '/../build/magento/app/Mage.php')) {
require_once $mage;
Mage::app();
} else {