fix propel version in composer file and exclude some directory in

phpunit code-coverage parameter
This commit is contained in:
Manuel Raynaud
2013-02-16 09:25:22 +01:00
parent 19790b6169
commit 3b08bad735
4 changed files with 16 additions and 2 deletions

1
.gitignore vendored
View File

@@ -8,3 +8,4 @@ log/*
bin/*
composer.lock
local/session/*
coverage

View File

@@ -9,7 +9,7 @@
"require":{
"php": ">=5.4.0",
"ircmaxell/password-compat": "dev-master",
"propel/propel1" : "1.6.*",
"propel/propel1" : "1.6.7",
"psr/log" : "dev-master",
"symfony/class-loader": "2.1.*",
"symfony/config" : "2.1.*",

View File

@@ -7,7 +7,7 @@
*/
$env = "test";
define('THELIA_ROOT', __DIR__ .'/../../../../');
$loader = require __DIR__ . '/../../../autoload.php';
$loader = require __DIR__ . '/../../../vendor/autoload.php';
require THELIA_ROOT . '/local/config/config_db.php';

View File

@@ -2,6 +2,9 @@
<phpunit
colors="true"
convertErrorsToExceptions= "true"
convertNoticesToExceptions= "true"
convertWarningsToExceptions= "true"
bootstrap="core/lib/Thelia/Tests/bootstrap.php"
verbose="true"
backupGlobals="false"
@@ -11,4 +14,14 @@
<directory>core/lib/Thelia/Tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>core/lib</directory>
<exclude>
<directory>core/lib/Thelia/Model/map</directory>
<directory>core/lib/Thelia/Model/om</directory>
<directory>core/lib/Thelia/Tests</directory>
</exclude>
</whitelist>
</filter>
</phpunit>