Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benakamoorthi@fastmail.fm>2014-08-13 13:50:40 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-08-13 13:50:49 +0400
commit1472a5cca21e1f8eda449ced6852d38549fe3b9c (patch)
treead458d79484b4381d644da8af109a1d11607e7d7 /plugins
parent42fb686b6708f3e5ce3a1364681c9d182d771ca3 (diff)
In generate:travis-yml command, look for tests in root tests folder as well as subfolders.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CoreConsole/TravisYmlView.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/CoreConsole/TravisYmlView.php b/plugins/CoreConsole/TravisYmlView.php
index d0ba5dcda8..bf14ecaa59 100644
--- a/plugins/CoreConsole/TravisYmlView.php
+++ b/plugins/CoreConsole/TravisYmlView.php
@@ -217,7 +217,7 @@ class TravisYmlView extends View
private function doesFolderContainPluginTests($folderPath)
{
- $testFiles = glob($folderPath . "/**/*Test.php");
+ $testFiles = array_merge(glob($folderPath . "/**/*Test.php"), glob($folderPath . "/*Test.php"));
return !empty($testFiles);
}
@@ -230,7 +230,7 @@ class TravisYmlView extends View
private function doesFolderContainUITests($folderPath)
{
- $testFiles = glob($folderPath . "/**/*_spec.js");
+ $testFiles = array_merge(glob($folderPath . "/**/*_spec.js"), glob($folderPath . "/*_spec.js"));
return !empty($testFiles);
}