From 35630a820b3fb5ec13b6830c56d2a808f96d01c8 Mon Sep 17 00:00:00 2001 From: Thomas Steur <thomas.steur@gmail.com> Date: Sun, 14 Feb 2016 21:42:52 +0000 Subject: [PATCH] fix some tests --- ...tReportMetadata__API.getWidgetMetadata.xml | 862 +++++++++--------- tests/UI/expected-ui-screenshots | 2 +- 2 files changed, 450 insertions(+), 414 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 0f2755e07d..f6499f1062 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -39,7 +39,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits Over Time</name> + <name>Visits Overview</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -52,20 +52,20 @@ <order>2</order> </subcategory> <module>VisitsSummary</module> - <action>getEvolutionGraph</action> - <order>5</order> + <action>get</action> + <order>10</order> <parameters> <forceView>1</forceView> - <viewDataTable>graphEvolution</viewDataTable> + <viewDataTable>sparklines</viewDataTable> <module>VisitsSummary</module> - <action>getEvolutionGraph</action> + <action>get</action> </parameters> - <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> - <viewDataTable>graphEvolution</viewDataTable> + <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId> + <viewDataTable>sparklines</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits Overview</name> + <name>Visits Over Time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -78,16 +78,16 @@ <order>2</order> </subcategory> <module>VisitsSummary</module> - <action>get</action> - <order>10</order> + <action>getEvolutionGraph</action> + <order>5</order> <parameters> <forceView>1</forceView> - <viewDataTable>sparklines</viewDataTable> + <viewDataTable>graphEvolution</viewDataTable> <module>VisitsSummary</module> - <action>get</action> + <action>getEvolutionGraph</action> </parameters> - <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId> - <viewDataTable>sparklines</viewDataTable> + <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> + <viewDataTable>graphEvolution</viewDataTable> <isReport>1</isReport> </row> <row> @@ -142,31 +142,7 @@ <isReport>1</isReport> </row> <row> - <name>Screen Resolution</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>DevicesDetection_Devices</id> - <name>Devices</name> - <order>15</order> - </subcategory> - <module>Resolution</module> - <action>getResolution</action> - <order>108</order> - <parameters> - <module>Resolution</module> - <action>getResolution</action> - </parameters> - <uniqueId>widgetResolutiongetResolution</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Device brand</name> + <name>Device model</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -179,13 +155,13 @@ <order>15</order> </subcategory> <module>DevicesDetection</module> - <action>getBrand</action> - <order>104</order> + <action>getModel</action> + <order>102</order> <parameters> <module>DevicesDetection</module> - <action>getBrand</action> + <action>getModel</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrand</uniqueId> + <uniqueId>widgetDevicesDetectiongetModel</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -214,7 +190,7 @@ <isReport>1</isReport> </row> <row> - <name>Device model</name> + <name>Device brand</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -227,42 +203,18 @@ <order>15</order> </subcategory> <module>DevicesDetection</module> - <action>getModel</action> - <order>102</order> - <parameters> - <module>DevicesDetection</module> - <action>getModel</action> - </parameters> - <uniqueId>widgetDevicesDetectiongetModel</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Operating System versions</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>DevicesDetection_Software</id> - <name>Software</name> - <order>20</order> - </subcategory> - <module>DevicesDetection</module> - <action>getOsVersions</action> - <order>102</order> + <action>getBrand</action> + <order>104</order> <parameters> <module>DevicesDetection</module> - <action>getOsVersions</action> + <action>getBrand</action> </parameters> - <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId> + <uniqueId>widgetDevicesDetectiongetBrand</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browsers</name> + <name>Screen Resolution</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -270,23 +222,23 @@ <icon>icon-reporting-visitors</icon> </category> <subcategory> - <id>DevicesDetection_Software</id> - <name>Software</name> - <order>20</order> + <id>DevicesDetection_Devices</id> + <name>Devices</name> + <order>15</order> </subcategory> - <module>DevicesDetection</module> - <action>getBrowsers</action> - <order>105</order> + <module>Resolution</module> + <action>getResolution</action> + <order>108</order> <parameters> - <module>DevicesDetection</module> - <action>getBrowsers</action> + <module>Resolution</module> + <action>getResolution</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId> + <uniqueId>widgetResolutiongetResolution</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Operating System families</name> + <name>Browser version</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -299,18 +251,18 @@ <order>20</order> </subcategory> <module>DevicesDetection</module> - <action>getOsFamilies</action> - <order>108</order> + <action>getBrowserVersions</action> + <order>106</order> <parameters> <module>DevicesDetection</module> - <action>getOsFamilies</action> + <action>getBrowserVersions</action> </parameters> - <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> + <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browser Plugins</name> + <name>Configurations</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -322,19 +274,19 @@ <name>Software</name> <order>20</order> </subcategory> - <module>DevicePlugins</module> - <action>getPlugin</action> - <order>113</order> + <module>Resolution</module> + <action>getConfiguration</action> + <order>107</order> <parameters> - <module>DevicePlugins</module> - <action>getPlugin</action> + <module>Resolution</module> + <action>getConfiguration</action> </parameters> - <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> + <uniqueId>widgetResolutiongetConfiguration</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Configurations</name> + <name>Browsers</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -346,19 +298,19 @@ <name>Software</name> <order>20</order> </subcategory> - <module>Resolution</module> - <action>getConfiguration</action> - <order>107</order> + <module>DevicesDetection</module> + <action>getBrowsers</action> + <order>105</order> <parameters> - <module>Resolution</module> - <action>getConfiguration</action> + <module>DevicesDetection</module> + <action>getBrowsers</action> </parameters> - <uniqueId>widgetResolutiongetConfiguration</uniqueId> + <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browser engines</name> + <name>Operating System versions</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -371,19 +323,18 @@ <order>20</order> </subcategory> <module>DevicesDetection</module> - <action>getBrowserEngines</action> - <order>110</order> + <action>getOsVersions</action> + <order>102</order> <parameters> - <viewDataTable>graphPie</viewDataTable> <module>DevicesDetection</module> - <action>getBrowserEngines</action> + <action>getOsVersions</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrowserEnginesviewDataTablegraphPie</uniqueId> - <viewDataTable>graphPie</viewDataTable> + <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browser version</name> + <name>Operating System families</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -396,13 +347,13 @@ <order>20</order> </subcategory> <module>DevicesDetection</module> - <action>getBrowserVersions</action> - <order>106</order> + <action>getOsFamilies</action> + <order>108</order> <parameters> <module>DevicesDetection</module> - <action>getBrowserVersions</action> + <action>getOsFamilies</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId> + <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -481,6 +432,77 @@ </row> </widgets> </row> + <row> + <name>Browser engines</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>DevicesDetection_Software</id> + <name>Software</name> + <order>20</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrowserEngines</action> + <order>110</order> + <parameters> + <viewDataTable>graphPie</viewDataTable> + <module>DevicesDetection</module> + <action>getBrowserEngines</action> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrowserEnginesviewDataTablegraphPie</uniqueId> + <viewDataTable>graphPie</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Browser Plugins</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>DevicesDetection_Software</id> + <name>Software</name> + <order>20</order> + </subcategory> + <module>DevicePlugins</module> + <action>getPlugin</action> + <order>113</order> + <parameters> + <module>DevicePlugins</module> + <action>getPlugin</action> + </parameters> + <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Visitor Map</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>UserCountry_SubmenuLocations</id> + <name>Locations</name> + <order>25</order> + </subcategory> + <module>UserCountryMap</module> + <action>visitorMap</action> + <order>1</order> + <parameters> + <module>UserCountryMap</module> + <action>visitorMap</action> + </parameters> + <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> + </row> <row> <name>City</name> <category> @@ -506,7 +528,7 @@ <isReport>1</isReport> </row> <row> - <name>Language code</name> + <name>Browser language</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -519,18 +541,18 @@ <order>25</order> </subcategory> <module>UserLanguage</module> - <action>getLanguageCode</action> - <order>111</order> + <action>getLanguage</action> + <order>108</order> <parameters> <module>UserLanguage</module> - <action>getLanguageCode</action> + <action>getLanguage</action> </parameters> - <uniqueId>widgetUserLanguagegetLanguageCode</uniqueId> + <uniqueId>widgetUserLanguagegetLanguage</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browser language</name> + <name>Region</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -542,14 +564,14 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserLanguage</module> - <action>getLanguage</action> - <order>108</order> + <module>UserCountry</module> + <action>getRegion</action> + <order>107</order> <parameters> - <module>UserLanguage</module> - <action>getLanguage</action> + <module>UserCountry</module> + <action>getRegion</action> </parameters> - <uniqueId>widgetUserLanguagegetLanguage</uniqueId> + <uniqueId>widgetUserCountrygetRegion</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -578,7 +600,7 @@ <isReport>1</isReport> </row> <row> - <name>Visitor Map</name> + <name>Country</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -590,17 +612,19 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountryMap</module> - <action>visitorMap</action> - <order>1</order> + <module>UserCountry</module> + <action>getCountry</action> + <order>105</order> <parameters> - <module>UserCountryMap</module> - <action>visitorMap</action> + <module>UserCountry</module> + <action>getCountry</action> </parameters> - <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> + <uniqueId>widgetUserCountrygetCountry</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> </row> <row> - <name>Region</name> + <name>Language code</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -612,19 +636,19 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountry</module> - <action>getRegion</action> - <order>107</order> + <module>UserLanguage</module> + <action>getLanguageCode</action> + <order>111</order> <parameters> - <module>UserCountry</module> - <action>getRegion</action> + <module>UserLanguage</module> + <action>getLanguageCode</action> </parameters> - <uniqueId>widgetUserCountrygetRegion</uniqueId> + <uniqueId>widgetUserLanguagegetLanguageCode</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Country</name> + <name>Visits by Days Since Last Visit</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -632,23 +656,23 @@ <icon>icon-reporting-visitors</icon> </category> <subcategory> - <id>UserCountry_SubmenuLocations</id> - <name>Locations</name> - <order>25</order> + <id>VisitorInterest_Engagement</id> + <name>Engagement</name> + <order>30</order> </subcategory> - <module>UserCountry</module> - <action>getCountry</action> - <order>105</order> + <module>VisitorInterest</module> + <action>getNumberOfVisitsByDaysSinceLast</action> + <order>130</order> <parameters> - <module>UserCountry</module> - <action>getCountry</action> + <module>VisitorInterest</module> + <action>getNumberOfVisitsByDaysSinceLast</action> </parameters> - <uniqueId>widgetUserCountrygetCountry</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Returning Visits Over Time</name> + <name>Visits per visit duration</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -660,17 +684,16 @@ <name>Engagement</name> <order>30</order> </subcategory> - <module>VisitFrequency</module> - <action>getEvolutionGraph</action> - <order>1</order> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> + <order>115</order> <parameters> - <forceView>1</forceView> - <viewDataTable>graphEvolution</viewDataTable> - <module>VisitFrequency</module> - <action>getEvolutionGraph</action> + <viewDataTable>cloud</viewDataTable> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> </parameters> - <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> - <viewDataTable>graphEvolution</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDurationviewDataTablecloud</uniqueId> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> @@ -699,7 +722,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Returning Visits Over Time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -711,15 +734,17 @@ <name>Engagement</name> <order>30</order> </subcategory> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> - <order>125</order> + <module>VisitFrequency</module> + <action>getEvolutionGraph</action> + <order>1</order> <parameters> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> + <forceView>1</forceView> + <viewDataTable>graphEvolution</viewDataTable> + <module>VisitFrequency</module> + <action>getEvolutionGraph</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> + <viewDataTable>graphEvolution</viewDataTable> <isReport>1</isReport> </row> <row> @@ -740,30 +765,6 @@ </parameters> <uniqueId>widgetLivegetVisitorProfilePopup</uniqueId> </row> - <row> - <name>Visits by Days Since Last Visit</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>VisitorInterest_Engagement</id> - <name>Engagement</name> - <order>30</order> - </subcategory> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByDaysSinceLast</action> - <order>130</order> - <parameters> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByDaysSinceLast</action> - </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> <row> <name>Frequency Overview</name> <category> @@ -791,7 +792,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits per visit duration</name> + <name>Visits by Visit Number</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -804,19 +805,18 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <order>115</order> + <action>getNumberOfVisitsByVisitCount</action> + <order>125</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> + <action>getNumberOfVisitsByVisitCount</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDurationviewDataTablecloud</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits by Day of Week</name> + <name>Visits per local time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -829,14 +829,14 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getByDayOfWeek</action> - <order>125</order> + <action>getVisitInformationPerLocalTime</action> + <order>115</order> <parameters> <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> - <action>getByDayOfWeek</action> + <action>getVisitInformationPerLocalTime</action> </parameters> - <uniqueId>widgetVisitTimegetByDayOfWeekviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerLocalTimeviewDataTablegraphVerticalBar</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -866,7 +866,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits per local time</name> + <name>Visits by Day of Week</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -879,14 +879,14 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> - <order>115</order> + <action>getByDayOfWeek</action> + <order>125</order> <parameters> <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> + <action>getByDayOfWeek</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerLocalTimeviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetByDayOfWeekviewDataTablegraphVerticalBar</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -1009,7 +1009,7 @@ <isReport>1</isReport> </row> <row> - <name>Pages Following a Site Search</name> + <name>Search Keywords with No Results</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1022,18 +1022,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> - <order>116</order> + <action>getSiteSearchNoResultKeywords</action> + <order>118</order> <parameters> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> + <action>getSiteSearchNoResultKeywords</action> </parameters> - <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Keywords with No Results</name> + <name>Page Titles Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1046,18 +1046,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> - <order>118</order> + <action>getPageTitlesFollowingSiteSearch</action> + <order>119</order> <parameters> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> + <action>getPageTitlesFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> + <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Page Titles Following a Site Search</name> + <name>Search Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1070,18 +1070,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> - <order>119</order> + <action>getSiteSearchCategories</action> + <order>120</order> <parameters> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> + <action>getSiteSearchCategories</action> </parameters> - <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchCategories</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Categories</name> + <name>Pages Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1094,13 +1094,13 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchCategories</action> - <order>120</order> + <action>getPageUrlsFollowingSiteSearch</action> + <order>116</order> <parameters> <module>Actions</module> - <action>getSiteSearchCategories</action> + <action>getPageUrlsFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchCategories</uniqueId> + <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1128,6 +1128,26 @@ <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> + <row> + <name>Entry Page Titles</name> + <category> + <id>General_Actions</id> + <name>Actions</name> + <order>10</order> + <icon>icon-reporting-actions</icon> + </category> + <subcategory /> + <module>Actions</module> + <action>getEntryPageTitles</action> + <order>106</order> + <parameters> + <module>Actions</module> + <action>getEntryPageTitles</action> + </parameters> + <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> <row> <name>Outlinks</name> <category> @@ -1227,7 +1247,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Actions</name> + <name>Event Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1240,19 +1260,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getAction</action> - <order>101</order> + <action>getCategory</action> + <order>100</order> <parameters> <module>Events</module> - <action>getAction</action> - <secondaryDimension>eventName</secondaryDimension> + <action>getCategory</action> + <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> + <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Actions</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1265,14 +1285,14 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getName</action> - <order>102</order> + <action>getAction</action> + <order>101</order> <parameters> <module>Events</module> - <action>getName</action> - <secondaryDimension>eventAction</secondaryDimension> + <action>getAction</action> + <secondaryDimension>eventName</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1302,27 +1322,7 @@ <isReport>1</isReport> </row> <row> - <name>Entry Page Titles</name> - <category> - <id>General_Actions</id> - <name>Actions</name> - <order>10</order> - <icon>icon-reporting-actions</icon> - </category> - <subcategory /> - <module>Actions</module> - <action>getEntryPageTitles</action> - <order>106</order> - <parameters> - <module>Actions</module> - <action>getEntryPageTitles</action> - </parameters> - <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Event Categories</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1335,14 +1335,14 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getCategory</action> - <order>100</order> + <action>getName</action> + <order>102</order> <parameters> <module>Events</module> - <action>getCategory</action> + <action>getName</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1371,46 +1371,46 @@ <isReport>1</isReport> </row> <row> - <name>Content Piece</name> + <name>Exit page titles</name> <category> <id>General_Actions</id> <name>Actions</name> <order>10</order> <icon>icon-reporting-actions</icon> </category> - <subcategory> - <id>Contents_Contents</id> - <name>Contents</name> - <order>45</order> - </subcategory> - <module>Contents</module> - <action>getContentPieces</action> - <order>136</order> + <subcategory /> + <module>Actions</module> + <action>getExitPageTitles</action> + <order>107</order> <parameters> - <module>Contents</module> - <action>getContentPieces</action> + <module>Actions</module> + <action>getExitPageTitles</action> </parameters> - <uniqueId>widgetContentsgetContentPieces</uniqueId> + <uniqueId>widgetActionsgetExitPageTitles</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Exit page titles</name> + <name>Content Name</name> <category> <id>General_Actions</id> <name>Actions</name> <order>10</order> <icon>icon-reporting-actions</icon> </category> - <subcategory /> - <module>Actions</module> - <action>getExitPageTitles</action> - <order>107</order> + <subcategory> + <id>Contents_Contents</id> + <name>Contents</name> + <order>45</order> + </subcategory> + <module>Contents</module> + <action>getContentNames</action> + <order>135</order> <parameters> - <module>Actions</module> - <action>getExitPageTitles</action> + <module>Contents</module> + <action>getContentNames</action> </parameters> - <uniqueId>widgetActionsgetExitPageTitles</uniqueId> + <uniqueId>widgetContentsgetContentNames</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1439,7 +1439,7 @@ <isReport>1</isReport> </row> <row> - <name>Content Name</name> + <name>Content Piece</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1452,18 +1452,18 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentNames</action> - <order>135</order> + <action>getContentPieces</action> + <order>136</order> <parameters> <module>Contents</module> - <action>getContentNames</action> + <action>getContentPieces</action> </parameters> - <uniqueId>widgetContentsgetContentNames</uniqueId> + <uniqueId>widgetContentsgetContentPieces</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Referrers</name> + <name>Referrer Types</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1476,19 +1476,19 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getAll</action> - <order>102</order> + <action>getReferrerType</action> + <order>101</order> <parameters> <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> - <action>getAll</action> + <action>getReferrerType</action> </parameters> - <uniqueId>widgetReferrersgetAllviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableAllColumns</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Referrer Types</name> + <name>Referrers</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1501,19 +1501,19 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getReferrerType</action> - <order>101</order> + <action>getAll</action> + <order>102</order> <parameters> <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> - <action>getReferrerType</action> + <action>getAll</action> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetAllviewDataTabletableAllColumns</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Engines</name> + <name>Keywords</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1526,18 +1526,18 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getSearchEngines</action> - <order>107</order> + <action>getKeywords</action> + <order>103</order> <parameters> <module>Referrers</module> - <action>getSearchEngines</action> + <action>getKeywords</action> </parameters> - <uniqueId>widgetReferrersgetSearchEngines</uniqueId> + <uniqueId>widgetReferrersgetKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Keywords</name> + <name>Search Engines</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1550,13 +1550,13 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getKeywords</action> - <order>103</order> + <action>getSearchEngines</action> + <order>107</order> <parameters> <module>Referrers</module> - <action>getKeywords</action> + <action>getSearchEngines</action> </parameters> - <uniqueId>widgetReferrersgetKeywords</uniqueId> + <uniqueId>widgetReferrersgetSearchEngines</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1790,6 +1790,30 @@ <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> + <row> + <name>Product Category</name> + <category> + <id>Goals_Ecommerce</id> + <name>Ecommerce</name> + <order>20</order> + <icon>icon-reporting-ecommerce</icon> + </category> + <subcategory> + <id>Goals_Products</id> + <name>Products</name> + <order>10</order> + </subcategory> + <module>Goals</module> + <action>getItemsCategory</action> + <order>132</order> + <parameters> + <module>Goals</module> + <action>getItemsCategory</action> + </parameters> + <uniqueId>widgetGoalsgetItemsCategory</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> + </row> <row> <name>Product Name</name> <category> @@ -1886,30 +1910,6 @@ <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> - <row> - <name>Product Category</name> - <category> - <id>Goals_Ecommerce</id> - <name>Ecommerce</name> - <order>20</order> - <icon>icon-reporting-ecommerce</icon> - </category> - <subcategory> - <id>Goals_Products</id> - <name>Products</name> - <order>10</order> - </subcategory> - <module>Goals</module> - <action>getItemsCategory</action> - <order>132</order> - <parameters> - <module>Goals</module> - <action>getItemsCategory</action> - </parameters> - <uniqueId>widgetGoalsgetItemsCategory</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> <row> <name>Overview</name> <category> @@ -2421,19 +2421,21 @@ <icon /> </category> <subcategory> - <id>ExampleUI_GetTemperaturesDataTable</id> - <name>Data tables</name> + <id>Bar graph</id> + <name>Bar graph</name> <order>99</order> </subcategory> <module>ExampleUI</module> <action>getTemperatures</action> <order>210</order> <parameters> + <forceView>1</forceView> + <viewDataTable>graphVerticalBar</viewDataTable> <module>ExampleUI</module> <action>getTemperatures</action> </parameters> - <uniqueId>widgetExampleUIgetTemperatures</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId> + <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2445,21 +2447,19 @@ <icon /> </category> <subcategory> - <id>Bar graph</id> - <name>Bar graph</name> + <id>ExampleUI_GetTemperaturesDataTable</id> + <name>Data tables</name> <order>99</order> </subcategory> <module>ExampleUI</module> <action>getTemperatures</action> <order>210</order> <parameters> - <forceView>1</forceView> - <viewDataTable>graphVerticalBar</viewDataTable> <module>ExampleUI</module> <action>getTemperatures</action> </parameters> - <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId> - <viewDataTable>graphVerticalBar</viewDataTable> + <uniqueId>widgetExampleUIgetTemperatures</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2488,6 +2488,31 @@ <viewDataTable>infoviz-treemap</viewDataTable> <isReport>1</isReport> </row> + <row> + <name>Pie graph</name> + <category> + <id>ExampleUI_UiFramework</id> + <name>UI Framework</name> + <order>90</order> + <icon /> + </category> + <subcategory> + <id>Pie graph</id> + <name>Pie graph</name> + <order>99</order> + </subcategory> + <module>ExampleUI</module> + <action>getPlanetRatios</action> + <order>212</order> + <parameters> + <viewDataTable>graphPie</viewDataTable> + <module>ExampleUI</module> + <action>getPlanetRatios</action> + </parameters> + <uniqueId>widgetExampleUIgetPlanetRatiosviewDataTablegraphPie</uniqueId> + <viewDataTable>graphPie</viewDataTable> + <isReport>1</isReport> + </row> <row> <name>Evolution of server temperatures over the last few days</name> <category> @@ -2596,32 +2621,7 @@ <isReport>1</isReport> </row> <row> - <name>Pie graph</name> - <category> - <id>ExampleUI_UiFramework</id> - <name>UI Framework</name> - <order>90</order> - <icon /> - </category> - <subcategory> - <id>Pie graph</id> - <name>Pie graph</name> - <order>99</order> - </subcategory> - <module>ExampleUI</module> - <action>getPlanetRatios</action> - <order>212</order> - <parameters> - <viewDataTable>graphPie</viewDataTable> - <module>ExampleUI</module> - <action>getPlanetRatios</action> - </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosviewDataTablegraphPie</uniqueId> - <viewDataTable>graphPie</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Top Keywords for Page URL</name> + <name>SEO Rankings</name> <category> <id>SEO</id> <name>SEO</name> @@ -2629,14 +2629,14 @@ <icon /> </category> <subcategory /> - <module>Referrers</module> - <action>getKeywordsForPage</action> + <module>SEO</module> + <action>getRank</action> <order>99</order> <parameters> - <module>Referrers</module> - <action>getKeywordsForPage</action> + <module>SEO</module> + <action>getRank</action> </parameters> - <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> + <uniqueId>widgetSEOgetRank</uniqueId> </row> <row> <name>Insights Overview</name> @@ -2656,11 +2656,29 @@ </parameters> <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> </row> + <row> + <name>Piwik.org Blog</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> + <order>99</order> + <parameters> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> + </parameters> + <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> + </row> <row> <name>Example Widget Name</name> <category> - <id>Example Widgets</id> - <name>Example Widgets</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> @@ -2693,7 +2711,7 @@ <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> </row> <row> - <name>SEO Rankings</name> + <name>Top Keywords for Page URL</name> <category> <id>SEO</id> <name>SEO</name> @@ -2701,20 +2719,56 @@ <icon /> </category> <subcategory /> - <module>SEO</module> - <action>getRank</action> + <module>Referrers</module> + <action>getKeywordsForPage</action> <order>99</order> <parameters> - <module>SEO</module> - <action>getRank</action> + <module>Referrers</module> + <action>getKeywordsForPage</action> </parameters> - <uniqueId>widgetSEOgetRank</uniqueId> + <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> + </row> + <row> + <name>Support Piwik!</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>CoreHome</module> + <action>getDonateForm</action> + <order>5</order> + <parameters> + <module>CoreHome</module> + <action>getDonateForm</action> + </parameters> + <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + </row> + <row> + <name>Piwik PRO: Advanced Analytics & Services</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>PiwikPro</module> + <action>promoPiwikPro</action> + <order>99</order> + <parameters> + <module>PiwikPro</module> + <action>promoPiwikPro</action> + </parameters> + <uniqueId>widgetPiwikPropromoPiwikPro</uniqueId> </row> <row> <name>Piwik Changelog</name> <category> - <id>Example Widgets</id> - <name>Example Widgets</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> @@ -2731,8 +2785,8 @@ <row> <name>Welcome!</name> <category> - <id>Example Widgets</id> - <name>Example Widgets</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> @@ -2747,39 +2801,21 @@ <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> </row> <row> - <name>Piwik.org Blog</name> + <name>Piwik PRO Blog</name> <category> - <id>Example Widgets</id> - <name>Example Widgets</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> + <module>PiwikPro</module> + <action>rssPiwikPro</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> - </parameters> - <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> - </row> - <row> - <name>Support Piwik!</name> - <category> - <id>Example Widgets</id> - <name>Example Widgets</name> - <order>99</order> - <icon /> - </category> - <subcategory /> - <module>CoreHome</module> - <action>getDonateForm</action> - <order>5</order> - <parameters> - <module>CoreHome</module> - <action>getDonateForm</action> + <module>PiwikPro</module> + <action>rssPiwikPro</action> </parameters> - <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + <uniqueId>widgetPiwikProrssPiwikPro</uniqueId> </row> </result> \ No newline at end of file diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots index f52be03f16..a3a5924c85 160000 --- a/tests/UI/expected-ui-screenshots +++ b/tests/UI/expected-ui-screenshots @@ -1 +1 @@ -Subproject commit f52be03f1613724942f6fdc3430abd1743cd6c44 +Subproject commit a3a5924c8530c2cbbf95071e153f26c3927e7e38 -- GitLab