Permalink
Browse files

Merge branch 'feature/various-fixes' into develop

  • Loading branch information...
2 parents 388e42a + 13ede84 commit b89678b09286c41873204336e454bedb435ee57f @trq trq committed Apr 6, 2013
Showing with 8 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +2 −0 Phakefile
  3. +1 −0 lib/Proem/Service/Tests/AssetManagerTest.php
  4. +4 −1 tests/phpunit.xml
View
@@ -5,3 +5,4 @@ vendor
composer.lock
.proem.taglist
.subsplit
+tags
View
@@ -25,6 +25,8 @@ group('dev', function() {
mkdir('tests/coverage');
}
$report = ' --coverage-html tests/coverage ';
+ } else {
+ $report = ' --coverage-text="php://stdout" ';
}
if (isset($args['verbose'])) {
system('vendor/bin/phpunit' . $report . '--colors --debug --verbose --configuration tests/phpunit.xml');
@@ -383,6 +383,7 @@ public function testCanAutoResolveAliased()
public function testCanAutoResolveAliasedDependency()
{
require_once __DIR__ . '/AssetManagerFixtures/Foo.php';
+ require_once __DIR__ . '/AssetManagerFixtures/Bar.php';
require_once __DIR__ . '/AssetManagerFixtures/Bar2.php';
$am = new AssetManager;
$am->alias('Bar2', 'Bar');
View
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit color="true">
+<phpunit
+ color="true"
+ processIsolation="true"
+ >
<testsuites>
<testsuite name="Proem Framework Test Suite">
<directory>./</directory>

0 comments on commit b89678b

Please sign in to comment.