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:
authormattab <matthieu.aubry@gmail.com>2018-01-19 01:06:15 +0300
committermattab <matthieu.aubry@gmail.com>2018-01-19 01:06:15 +0300
commit65289709547f533bab68505f49627d7466a0745f (patch)
treebd899e3fe11eea910aa5dedc46bb1cb16f232e19
parent2b734a283c71aef507bce2daabdbfdb583723dc8 (diff)
parent45c73bd0716749439b9bd4df7966c82a29658b49 (diff)
Merge branch 'danikachhour-totals' into 3.x-dev
-rw-r--r--tests/PHPUnit/Framework/TestRequest/Collection.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
index 32fd749ebd..db19679f01 100644
--- a/tests/PHPUnit/Framework/TestRequest/Collection.php
+++ b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -335,8 +335,9 @@ class Collection
if (!in_array('UserCountry.getLocationFromIP', $apiToCall) &&
!in_array('UserCountry.getCountryCodeMapping', $apiToCall)) {
- $this->apiNotToCall = array('API.getPiwikVersion',
+ $this->apiNotToCall = array(
'API.getMatomoVersion',
+ 'API.getPiwikVersion',
'UserCountry.getLocationFromIP',
'UserCountry.getCountryCodeMapping');
} else {