Skip to content

Commit 897a1a7

Browse files
authored
Updates expected test files after core change (#81)
* update expected test files * fix tests for older releases * adjust version
1 parent d709424 commit 897a1a7

File tree

2 files changed

+27
-11
lines changed

2 files changed

+27
-11
lines changed

tests/System/DeviceDetectorCacheTest.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
use Piwik\Plugins\DeviceDetectorCache\tests\Fixtures\SimpleFixtureTrackFewVisits;
1313
use Piwik\Tests\Framework\TestCase\SystemTestCase;
14+
use Piwik\Version;
1415

1516
/**
1617
* @group DeviceDetectorCache
@@ -38,6 +39,18 @@ public function getApiForTesting()
3839
'Live.getLastVisitsDetails',
3940
];
4041

42+
$columnsToHide = [];
43+
44+
if (version_compare(Version::VERSION, '5.2.0-alpha', '<')) {
45+
// In Matomo 5.2 referrer columns had been added to ecommerce actions. For tests with older Matomo releases we therefor ignore those columns
46+
$columnsToHide = array_merge($columnsToHide, ['referrerType', 'referrerName', 'referrerKeyword']);
47+
}
48+
49+
if (version_compare(Version::VERSION, '5.5.0-b1', '<')) {
50+
// In Matomo 5.5 ai referrer had been added
51+
$columnsToHide = array_merge($columnsToHide, ['referrerAIAssistantUrl', 'referrerAIAssistantIcon']);
52+
}
53+
4154
$apiToTest = [];
4255
$apiToTest[] = [
4356
$api,
@@ -46,8 +59,7 @@ public function getApiForTesting()
4659
'date' => self::$fixture->dateTime,
4760
'periods' => ['day'],
4861
'testSuffix' => '',
49-
// fields were added in Matomo 5.2-alpha, so ignore them as they are not relevant for this plugin anyways
50-
'xmlFieldsToRemove' => ['referrerType', 'referrerName', 'referrerKeyword']
62+
'xmlFieldsToRemove' => $columnsToHide,
5163
],
5264
];
5365

tests/System/expected/test___Live.getLastVisitsDetails_day.xml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<items>1</items>
5252

5353

54-
55-
56-
54+
<referrerType>direct</referrerType>
55+
<referrerName />
56+
<referrerKeyword />
5757
<itemDetails>
5858
<row>
5959
<itemSKU>SKU_ID2</itemSKU>
@@ -104,16 +104,18 @@
104104
<searches>1</searches>
105105
<actions>2</actions>
106106
<interactions>2</interactions>
107-
107+
<referrerType>direct</referrerType>
108108
<referrerTypeName>Direct Entry</referrerTypeName>
109-
110-
109+
<referrerName />
110+
<referrerKeyword />
111111
<referrerKeywordPosition />
112112
<referrerUrl />
113113
<referrerSearchEngineUrl />
114114
<referrerSearchEngineIcon />
115115
<referrerSocialNetworkUrl />
116116
<referrerSocialNetworkIcon />
117+
<referrerAIAssistantUrl />
118+
<referrerAIAssistantIcon />
117119
<languageCode>fr</languageCode>
118120
<language>French</language>
119121
<deviceType>Smartphone</deviceType>
@@ -231,16 +233,18 @@
231233
<searches>0</searches>
232234
<actions>1</actions>
233235
<interactions>1</interactions>
234-
236+
<referrerType>direct</referrerType>
235237
<referrerTypeName>Direct Entry</referrerTypeName>
236-
237-
238+
<referrerName />
239+
<referrerKeyword />
238240
<referrerKeywordPosition />
239241
<referrerUrl />
240242
<referrerSearchEngineUrl />
241243
<referrerSearchEngineIcon />
242244
<referrerSocialNetworkUrl />
243245
<referrerSocialNetworkIcon />
246+
<referrerAIAssistantUrl />
247+
<referrerAIAssistantIcon />
244248
<languageCode>fr</languageCode>
245249
<language>French</language>
246250
<deviceType>Desktop</deviceType>

0 commit comments

Comments
 (0)