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 <diosmosis@users.noreply.github.com>2018-08-09 14:24:16 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2018-08-09 14:24:16 +0300
commit2b77bb4d609dd0ec377a9edc32536f22dd4dabb2 (patch)
tree14e38fd0b07b26dbcf50dd2e25793b556d45baa7 /tests/PHPUnit/Framework/Mock
parent6112cc2ddf955b9c7183ba767e0a8acce93111ef (diff)
Add notification when report w/ segment has no data, but segment is unprocessed (#12823)3.6.0-b4
* When a report has no data, check if it is for an unprocessed segment and display an explanatory notification. * Remove transient notifications on reporting page change, allow datatable views to add notifications, use to display unprocessed segment message. * Update changelog. * Internationalize unprocessed segment message. * Parse notification divs in dashboardWidget.js when setting widget content. * Tweak message. * Change PR to use different approach: throw exception when no archives found and segment is used, then detect exception in new event. * Update changelog + document new event. * Unfinished review changes * more review fixes * Do not show notification w/ custom segments. * apply pr review * Apply review. * undo escaping since it was not needed & get test to pass * Different strategy + new test. * Fix tests. * Update two expected screenshots.
Diffstat (limited to 'tests/PHPUnit/Framework/Mock')
-rw-r--r--tests/PHPUnit/Framework/Mock/FakeAccess.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/Mock/FakeAccess.php b/tests/PHPUnit/Framework/Mock/FakeAccess.php
index be86704305..4f18cd717b 100644
--- a/tests/PHPUnit/Framework/Mock/FakeAccess.php
+++ b/tests/PHPUnit/Framework/Mock/FakeAccess.php
@@ -100,7 +100,7 @@ class FakeAccess extends Access
if (!self::$superUser) {
$websitesAccess = self::$idSitesAdmin;
} else {
- $websitesAccess = API::getInstance()->getAllSitesId();
+ return;
}
$idSites = PiwikSite::getIdSitesFromIdSitesString($idSites);
@@ -117,7 +117,7 @@ class FakeAccess extends Access
if (!self::$superUser) {
$websitesAccess = array_merge(self::$idSitesWrite, self::$idSitesAdmin);
} else {
- $websitesAccess = API::getInstance()->getAllSitesId();
+ return;
}
$idSites = PiwikSite::getIdSitesFromIdSitesString($idSites);