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-05-24 07:32:40 +0300
committerGitHub <noreply@github.com>2018-05-24 07:32:40 +0300
commit623bbf6fc331e5588e88666d0040857ae493f985 (patch)
treee9a6be0a51357a783b059e15c2f43707b8d9f742 /tests/PHPUnit
parent617de25752c965ca7a8ff1979419a43b2e90c7a1 (diff)
Rename Actions category to Behavior + Referrers category to Acquisition (#12950)
* Rename Actions category to Behavior + Referrers category to Acquisition while retaining category ID. * quick fix * Update expected system test files. * Updating screenshots & fixing test. * fix dashboard test * Update screenshots again.
Diffstat (limited to 'tests/PHPUnit')
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml28
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml60
-rw-r--r--tests/PHPUnit/Unit/Category/CategoryTest.php6
3 files changed, 50 insertions, 44 deletions
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
index 29d4519c25..9c0f3db6e5 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
@@ -4,7 +4,7 @@
<uniqueId>General_Actions.General_Downloads</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -34,7 +34,7 @@
<uniqueId>General_Actions.Actions_SubmenuPagesEntry</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -78,7 +78,7 @@
<uniqueId>General_Actions.Actions_SubmenuPagesExit</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -122,7 +122,7 @@
<uniqueId>General_Actions.General_Outlinks</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -152,7 +152,7 @@
<uniqueId>General_Actions.Actions_SubmenuPageTitles</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -182,7 +182,7 @@
<uniqueId>General_Actions.General_Pages</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -212,7 +212,7 @@
<uniqueId>General_Actions.Actions_SubmenuSitesearch</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -298,7 +298,7 @@
<uniqueId>General_Actions.Events_Events</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -409,7 +409,7 @@
<uniqueId>General_Actions.Contents_Contents</uniqueId>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1203,7 +1203,7 @@
<uniqueId>Referrers_Referrers.Referrers_WidgetGetAll</uniqueId>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1247,7 +1247,7 @@
<uniqueId>Referrers_Referrers.Referrers_Campaigns</uniqueId>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1277,7 +1277,7 @@
<uniqueId>Referrers_Referrers.General_Overview</uniqueId>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1328,7 +1328,7 @@
<uniqueId>Referrers_Referrers.Referrers_SubmenuSearchEngines</uniqueId>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1372,7 +1372,7 @@
<uniqueId>Referrers_Referrers.Referrers_SubmenuWebsites</uniqueId>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index d40d689014..1dde828e15 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -973,7 +973,7 @@
<name>Pages</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -998,7 +998,7 @@
<name>Entry Page Titles</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1023,7 +1023,7 @@
<name>Entry pages</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1048,7 +1048,7 @@
<name>Exit page titles</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1073,7 +1073,7 @@
<name>Exit pages</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1098,7 +1098,7 @@
<name>Page titles</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1123,7 +1123,7 @@
<name>Page Titles Following a Site Search</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1148,7 +1148,7 @@
<name>Pages Following a Site Search</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1173,7 +1173,7 @@
<name>Search Categories</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1198,7 +1198,7 @@
<name>Site Search Keywords</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1223,7 +1223,7 @@
<name>Search Keywords with No Results</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1248,7 +1248,7 @@
<name>Outlinks</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1273,7 +1273,7 @@
<name>Downloads</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1298,7 +1298,7 @@
<name>Actions: Event Actions</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1324,7 +1324,7 @@
<name>Actions: Event Actions</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1350,7 +1350,7 @@
<name>Actions: Event Categories</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1376,7 +1376,7 @@
<name>Actions: Event Categories</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1402,7 +1402,7 @@
<name>Actions: Event Names</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1428,7 +1428,7 @@
<name>Actions: Event Names</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1454,7 +1454,7 @@
<name>Actions: Content Name</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1479,7 +1479,7 @@
<name>Actions: Content Name</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1504,7 +1504,7 @@
<name>Actions: Content Piece</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1529,7 +1529,7 @@
<name>Actions: Content Piece</name>
<category>
<id>General_Actions</id>
- <name>Actions</name>
+ <name>Behaviour</name>
<order>10</order>
<icon>icon-reporting-actions</icon>
</category>
@@ -1554,7 +1554,7 @@
<name>Referrers</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1579,7 +1579,7 @@
<name>Referrer Types</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1604,7 +1604,7 @@
<name>Keywords</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1629,7 +1629,7 @@
<name>Search Engines</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1654,7 +1654,7 @@
<name>Social Networks</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1679,7 +1679,7 @@
<name>Websites</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
@@ -1704,7 +1704,7 @@
<name>Campaigns</name>
<category>
<id>Referrers_Referrers</id>
- <name>Referrers</name>
+ <name>Acquisition</name>
<order>15</order>
<icon>icon-reporting-referer</icon>
</category>
diff --git a/tests/PHPUnit/Unit/Category/CategoryTest.php b/tests/PHPUnit/Unit/Category/CategoryTest.php
index de4b931657..e66713f1e7 100644
--- a/tests/PHPUnit/Unit/Category/CategoryTest.php
+++ b/tests/PHPUnit/Unit/Category/CategoryTest.php
@@ -54,6 +54,12 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
$this->assertSame('', $this->category->getId());
}
+ public function test_getDisplayName_shouldUseId()
+ {
+ $this->category->setId('myCustomId');
+ $this->assertSame('myCustomId', $this->category->getDisplayName());
+ }
+
public function test_getSubcategories_ShouldReturnAnEmptyArray_ByDefault()
{
$this->assertSame(array(), $this->category->getSubcategories());