Include IntegrationTestCase in SetupFixture class since Fixture depen…

…ds on IntegrationTestCase, and check for specs in <plugindir>/tests in addition to <plugindir>/Test.
d19dotca · Jun 10, 2014 · 3c4eaf1 · 3c4eaf1
1 parent 346688d
commit 3c4eaf1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/plugins/CoreConsole/Commands/SetupFixture.php b/plugins/CoreConsole/Commands/SetupFixture.php
@@ -160,6 +160,7 @@ private function requireFixtureFiles()
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
         require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php';
+        require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php';
 
         $fixturesToLoad = array(
             '/tests/PHPUnit/Fixtures/*.php',

diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js
@@ -96,6 +96,7 @@ Application.prototype.loadTestModules = function () {
 
     plugins.forEach(function (pluginPath) {
         walk(path.join(pluginPath, 'Test'), /_spec\.js$/, modulePaths);
+        walk(path.join(pluginPath, 'tests'), /_spec\.js$/, modulePaths);
     });
 
     modulePaths.forEach(function (path) {
@@ -206,7 +207,7 @@ Application.prototype.doRunTests = function () {
 };
 
 Application.prototype.finish = function () {
-    phantom.exit(this.runner.failures);
+    phantom.exit(this.runner ? this.runner.failures : -1);
 };
 
 exports.Application = new Application();