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
path: root/tests
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-11-26 05:05:46 +0300
committerGitHub <noreply@github.com>2020-11-26 05:05:46 +0300
commitd9932eda35100ee9381e9835493757d15e947e49 (patch)
treeb9cf033ad518c140d1a4830bf2584a1b455b9159 /tests
parentea4ad4bca43d0d218807041e5263af8fd328bfeb (diff)
Add pluginjson for custom dimensions + fix build (#16799)
* Add pluginjson for custom dimensions fix https://github.com/matomo-org/matomo/issues/16786 * fix build
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php5
-rw-r--r--tests/PHPUnit/Integration/ReleaseCheckListTest.php2
-rw-r--r--tests/PHPUnit/Integration/Tracker/RequestTest.php2
3 files changed, 6 insertions, 3 deletions
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
index e2d2d59af0..9c9a4cb871 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -1227,12 +1227,13 @@ class ArchiveInvalidatorTest extends IntegrationTestCase
{
$this->invalidator->scheduleReArchiving([1, 2, 3], 'ExamplePlugin', '5');
$this->invalidator->applyScheduledReArchiving();
- $this->assertEquals(729, $this->getNumInvalidations());
+ $numInvalidations = $this->getNumInvalidations();
+ $this->assertGreaterThanOrEqual(600, $numInvalidations);
$this->invalidator->scheduleReArchiving([1, 2, 3], 'ExamplePlugin', '5');
$this->invalidator->applyScheduledReArchiving();
// should not end up having twice the amount of invalidations but delete existing
- $this->assertEquals(729, $this->getNumInvalidations());
+ $this->assertEquals($numInvalidations, $this->getNumInvalidations());
}
public function test_reArchiveReport_createsCorrectInvalidationEntries_ifNoReportSpecified()
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 793bb40baa..30036dafc5 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -252,6 +252,8 @@ class ReleaseCheckListTest extends \PHPUnit\Framework\TestCase
PIWIK_INCLUDE_PATH . '/plugins/CoreUpdater/templates/layout.twig',
PIWIK_INCLUDE_PATH . '/plugins/Installation/templates/layout.twig',
PIWIK_INCLUDE_PATH . '/plugins/Login/templates/loginLayout.twig',
+ PIWIK_INCLUDE_PATH . '/plugins/SEO/tests/resources/whois_response.html',
+ PIWIK_INCLUDE_PATH . '/plugins/SEO/tests/resources/whoiscom_response.html',
PIWIK_INCLUDE_PATH . '/tests/UI/screenshot-diffs/singlediff.html',
// Note: entries below are paths and any file within these paths will be automatically allowed
diff --git a/tests/PHPUnit/Integration/Tracker/RequestTest.php b/tests/PHPUnit/Integration/Tracker/RequestTest.php
index a9b017c6ef..9056a37d41 100644
--- a/tests/PHPUnit/Integration/Tracker/RequestTest.php
+++ b/tests/PHPUnit/Integration/Tracker/RequestTest.php
@@ -277,7 +277,7 @@ class RequestTest extends IntegrationTestCase
public function test_cdt_ShouldReturnTheCustomTimestamp_ShouldUseStrToTime_IfItIsNotATime()
{
- $request = $this->buildRequest(array('cdt' => '6 years ago'));
+ $request = $this->buildRequest(array('cdt' => '10 years ago'));
$request->setCurrentTimestamp($this->time);
$request->setIsAuthenticated();
$this->assertNotSame($this->time, $request->getCurrentTimestamp());