- $1,332
+ $0
|
0
@@ -6193,7 +6193,7 @@
@@ -6371,7 +6371,7 @@
@@ -6653,7 +6653,7 @@
@@ -6715,7 +6715,7 @@
@@ -6891,7 +6891,7 @@
@@ -7078,7 +7078,7 @@
@@ -7140,7 +7140,7 @@
@@ -7274,7 +7274,7 @@
@@ -7416,7 +7416,7 @@
@@ -7478,7 +7478,7 @@
@@ -7612,7 +7612,7 @@
diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index 14479e40893..b18370d113c 100644
Binary files a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ
diff --git a/plugins/Goals/tests/UI/Goals_spec.js b/plugins/Goals/tests/UI/Goals_spec.js
index 7faf1643a79..3eb7abb1836 100644
--- a/plugins/Goals/tests/UI/Goals_spec.js
+++ b/plugins/Goals/tests/UI/Goals_spec.js
@@ -61,6 +61,7 @@ describe("Goals", function () {
await page.waitForTimeout(100);
await page.waitForSelector('.dimensionReport .dataTableVizGoals');
await page.waitForNetworkIdle();
+ await page.mouse.move(-10, -10);
var report = await page.$('.dimensionReport');
expect(await report.screenshot()).to.matchImage('goals_by_page_titles');
@@ -74,6 +75,7 @@ describe("Goals", function () {
await page.waitForTimeout(100);
await page.waitForSelector('.dimensionReport .dataTableVizGoals');
await page.waitForNetworkIdle();
+ await page.mouse.move(-10, -10);
var report = await page.$('.dimensionReport');
expect(await report.screenshot()).to.matchImage('goals_by_entry_pages');
@@ -87,6 +89,7 @@ describe("Goals", function () {
await page.waitForTimeout(100);
await page.waitForSelector('.dimensionReport .dataTableVizGoals');
await page.waitForNetworkIdle();
+ await page.mouse.move(-10, -10);
var report = await page.$('.dimensionReport');
expect(await report.screenshot()).to.matchImage('goals_by_entry_page_titles');
diff --git a/plugins/Live/tests/UI/Live_spec.js b/plugins/Live/tests/UI/Live_spec.js
index 0cb63ada6fe..e46634e6dd9 100644
--- a/plugins/Live/tests/UI/Live_spec.js
+++ b/plugins/Live/tests/UI/Live_spec.js
@@ -118,7 +118,7 @@ describe("Live", function () {
it('should show action tooltip', async function() {
var action = await page.jQuery('.visitor-profile-visits li:first-child .visitor-profile-actions .action:first-child');
await action.hover();
- await page.waitForSelector('.ui-tooltip');
+ await page.waitForSelector('.ui-tooltip', {visible: true});
await page.waitForTimeout(250);
const elem = await page.$('.ui-tooltip');
@@ -135,7 +135,7 @@ describe("Live", function () {
$('.card:first-child .visitor-log-visitor-profile-link').click();
});
- await page.waitForSelector('.ui-dialog');
+ await page.waitForSelector('.ui-dialog', {visible: true});
await page.waitForNetworkIdle();
await page.mouse.move(-10, -10);
diff --git a/plugins/TagManager b/plugins/TagManager
index af4565dded8..f337cdf0ec9 160000
--- a/plugins/TagManager
+++ b/plugins/TagManager
@@ -1 +1 @@
-Subproject commit af4565dded8f2bef49d3259465ef02056a7d643b
+Subproject commit f337cdf0ec970e546a2669be00e3555cbae11225
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 57f9f586751..dc6744a7133 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -79,7 +79,7 @@ class Fixture extends \PHPUnit\Framework\Assert
{
const IMAGES_GENERATED_ONLY_FOR_OS = 'linux';
const IMAGES_GENERATED_FOR_PHP = '7.2';
- const IMAGES_GENERATED_FOR_GD = '2.1.0';
+ const IMAGES_GENERATED_FOR_GD = '2.3.3';
const DEFAULT_SITE_NAME = 'Piwik test';
const ADMIN_USER_LOGIN = 'superUserLogin';
diff --git a/tests/PHPUnit/Integration/AccessTest.php b/tests/PHPUnit/Integration/AccessTest.php
index 5a63fb8f92f..c0af228fa17 100644
--- a/tests/PHPUnit/Integration/AccessTest.php
+++ b/tests/PHPUnit/Integration/AccessTest.php
@@ -394,8 +394,6 @@ public function testCheckUserHasAdminAccessWithEmptyAccessNoSiteIdsGiven()
public function testCheckUserHasAdminAccessWithSomeAccessSuccessIdSitesAsString()
{
- self::expectNotToPerformAssertions();
-
$mock = $this->createPartialMock(
'Piwik\Access',
array('getSitesIdWithAdminAccess')
diff --git a/tests/PHPUnit/Integration/DbSSLTest.php b/tests/PHPUnit/Integration/DbSSLTest.php
deleted file mode 100644
index 1a142767f34..00000000000
--- a/tests/PHPUnit/Integration/DbSSLTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-database;
- if(isset($dbConfig['enable_ssl']) && $dbConfig['enable_ssl'] == true) {
- Db::createDatabaseObject($dbConfig);
- $cipher = Db::fetchRow("show status like 'Ssl_cipher'");
- $this->assertNotEmpty($cipher['Value']);
- } else {
- $this->markTestSkipped(true);
- }
- }
-}
diff --git a/tests/PHPUnit/Integration/FrontControllerTest.php b/tests/PHPUnit/Integration/FrontControllerTest.php
index d3f9d82fbcd..d6b1f33987c 100644
--- a/tests/PHPUnit/Integration/FrontControllerTest.php
+++ b/tests/PHPUnit/Integration/FrontControllerTest.php
@@ -23,7 +23,7 @@ class FrontControllerTest extends IntegrationTestCase
public function test_fatalErrorStackTracesReturned()
{
$url = Fixture::getRootUrl() . '/tests/resources/trigger-fatal.php?format=json';
- $response = Http::sendHttpRequest($url, self::isCIEnvironment() ? 2 : 20);
+ $response = Http::sendHttpRequest($url, self::isCIEnvironment() ? 5 : 20);
$response = json_decode($response, $isAssoc = true);
$response['message'] = $this->cleanMessage($response['message']);
@@ -40,7 +40,7 @@ public function test_fatalErrorStackTracesReturned()
public function test_thrownExceptionInFrontControllerPrintsBacktrace()
{
$url = Fixture::getRootUrl() . '/tests/resources/trigger-fatal-exception.php?format=json';
- $response = Http::sendHttpRequest($url, self::isCIEnvironment() ? 2 : 20);
+ $response = Http::sendHttpRequest($url, self::isCIEnvironment() ? 5 : 20);
$response = json_decode($response, $isAssoc = true);
$response['message'] = $this->cleanMessage($response['message']);
diff --git a/tests/PHPUnit/Integration/SegmentTest.php b/tests/PHPUnit/Integration/SegmentTest.php
index 3da0edea475..14ab43d7ee0 100644
--- a/tests/PHPUnit/Integration/SegmentTest.php
+++ b/tests/PHPUnit/Integration/SegmentTest.php
@@ -791,8 +791,6 @@ public function test_getSelectQuery_whenJoinLogLinkVisitActionOnActionOnVisit()
private function assertQueryDoesNotFail($query)
{
- self::expectNotToPerformAssertions();
-
Db::fetchAll($query['sql'], $query['bind']);
}
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
index 76ab6041f9d..e35a8936d6d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html
@@ -45,7 +45,7 @@
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html
index a7a4eb0ad15..6b84cf1b0e8 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_overEach__ScheduledReports.generateReport_month.original.html
@@ -45,7 +45,7 @@
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html
index 70b26ad83de..db44df58d4f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_row_evolution_prevCustomN__ScheduledReports.generateReport_month.original.html
@@ -45,7 +45,7 @@
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index cc80c644ef9..730ac7f0e99 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -390,7 +390,7 @@
@@ -490,7 +490,7 @@
@@ -576,7 +576,7 @@
@@ -671,7 +671,7 @@
@@ -762,7 +762,7 @@
@@ -832,7 +832,7 @@
@@ -923,7 +923,7 @@
@@ -993,7 +993,7 @@
@@ -1084,7 +1084,7 @@
@@ -1179,7 +1179,7 @@
@@ -1270,7 +1270,7 @@
@@ -1340,7 +1340,7 @@
@@ -1431,7 +1431,7 @@
@@ -1526,7 +1526,7 @@
@@ -1646,7 +1646,7 @@
@@ -1766,7 +1766,7 @@
@@ -1880,7 +1880,7 @@
@@ -1975,7 +1975,7 @@
@@ -2089,7 +2089,7 @@
@@ -2226,7 +2226,7 @@
@@ -2823,7 +2823,7 @@
@@ -3420,7 +3420,7 @@
@@ -3638,7 +3638,7 @@
@@ -3732,7 +3732,7 @@
@@ -3786,7 +3786,7 @@
@@ -3916,7 +3916,7 @@
@@ -3984,7 +3984,7 @@
@@ -4048,7 +4048,7 @@
@@ -4132,7 +4132,7 @@
@@ -4196,7 +4196,7 @@
@@ -4410,7 +4410,7 @@
@@ -4520,7 +4520,7 @@
@@ -4630,7 +4630,7 @@
@@ -4817,7 +4817,7 @@
@@ -4967,7 +4967,7 @@
@@ -5125,7 +5125,7 @@
@@ -5211,7 +5211,7 @@
@@ -5361,7 +5361,7 @@
@@ -5475,7 +5475,7 @@
@@ -5578,7 +5578,7 @@
@@ -5679,7 +5679,7 @@
@@ -5747,7 +5747,7 @@
@@ -5821,7 +5821,7 @@
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index e9e7e76aa70..27d82ceb8c2 100644
Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ
diff --git a/tests/PHPUnit/Unit/Tracker/RequestSetTest.php b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
index 05cc29343ee..62c12e09458 100644
--- a/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
+++ b/tests/PHPUnit/Unit/Tracker/RequestSetTest.php
@@ -29,7 +29,7 @@ public function setUp(): void
parent::setUp();
$this->requestSet = $this->createRequestSet();
- $this->time = time();
+ $this->time = 1693386000;
}
private function createRequestSet()
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png
deleted file mode 100644
index 7756cf29eb0..00000000000
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52bf7d2f5536420640b1e3d45d040baca3835cab691d2a91be088aaf1c012749
-size 666433
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png
deleted file mode 100644
index 3288710d715..00000000000
--- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55f1a2a9d081cbf9320ca0134589e201fdb7bd6878ea7eccfb80c69c8621e9db
-size 105265
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index d84527c1437..cac2d13f2a6 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -287,25 +287,6 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
expect(await pageWrap.screenshot()).to.matchImage('visitors_overview_limit');
});
- // skipped as phantom seems to crash at this test sometimes
- it.skip('should load visitors > visitor log page correctly', async function () {
- await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog");
- await page.waitForNetworkIdle();
-
- pageWrap = await page.$('.pageWrap');
- expect(await pageWrap.screenshot()).to.matchImage('visitors_visitorlog');
- });
-
- // this test often fails for unknown reasons?
- // the visitor log with site search is also currently tested in plugins/Live/tests/UI/expected-ui-screenshots/Live_visitor_log.png
- it.skip('should load visitors with site search > visitor log page correctly', async function () {
- await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog&period=day&date=2012-01-11");
- await page.waitForNetworkIdle();
-
- pageWrap = await page.$('.pageWrap');
- expect(await pageWrap.screenshot()).to.matchImage('visitors_with_site_search_visitorlog');
- });
-
it('should load the visitors > devices page correctly', async function () {
await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=DevicesDetection_Devices");
await page.waitForNetworkIdle();
|