Skip to content

Commit da7dab8

Browse files
snake14snake14
authored
Merge pull request #75 from innocraft/fix-build
[ignore_release] Fixing builds after changes in core
2 parents 5b9df90 + e5259b1 commit da7dab8

4 files changed

Lines changed: 117 additions & 37 deletions

File tree

‎tests/System/APITest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public function test_getTranslatableTypes($api)
6969
$this->clearCaches();
7070
}
7171

72-
$apiOutputIsMissingMetricTypes = version_compare(Version::VERSION, '5.2.0-b6', '<');
73-
$testSuffix = 'API.getReportMetadata' == $api && $apiOutputIsMissingMetricTypes ? '_Old' : '';
72+
$apiOutputIsMissingMetricChanges = version_compare(Version::VERSION, '5.2.0-b6', '<');
73+
$testSuffix = 'API.getReportMetadata' == $api && $apiOutputIsMissingMetricChanges ? '_Old' : '';
7474
$testSuffix = in_array($api, ['API.getReportPagesMetadata', 'API.getWidgetMetadata']) && version_compare(Version::VERSION, '5.0.0-rc5', '<=') ? '_Old' : $testSuffix;
7575

7676
$this->runAnyApiTest($api, '', $params, array('testSuffix' => $testSuffix, 'xmlFieldsToRemove' => array('imageGraphUrl', 'imageGraphEvolutionUrl')));
@@ -96,8 +96,6 @@ public function test_getTranslatableTypes_withCustomReports($api)
9696
return;
9797
}
9898

99-
$apiOutputIsMissingMetricTypes = version_compare(Version::VERSION, '4.13.4-b1', '<');
100-
10199
$this->clearCaches();
102100
$this->makeSureToLoadCustomReports();
103101

@@ -107,7 +105,7 @@ public function test_getTranslatableTypes_withCustomReports($api)
107105
'period' => 'day',
108106
);
109107

110-
$testSuffix = 'withCustomReports' . ('API.getReportMetadata' == $api && $apiOutputIsMissingMetricTypes ? '_Old' : '');
108+
$testSuffix = 'withCustomReports';
111109
$this->runAnyApiTest($api, '', $params, array('testSuffix' => $testSuffix, 'xmlFieldsToRemove' => array('imageGraphUrl', 'imageGraphEvolutionUrl')));
112110
}
113111

‎tests/System/expected/test___API.getReportMetadata_.xml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,6 @@
28622862
<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
28632863
<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
28642864
<bounce_rate>Bounce Rate</bounce_rate>
2865-
<conversion_rate>Conversion Rate</conversion_rate>
28662865
</processedMetrics>
28672866
<metricTypes>
28682867
<nb_visits>number</nb_visits>
@@ -2875,6 +2874,19 @@
28752874
<conversion_rate>percent</conversion_rate>
28762875
</metricTypes>
28772876
<actionToLoadSubTables>getUrlsForSocial</actionToLoadSubTables>
2877+
<metricsGoal>
2878+
<nb_conversions>Conversions</nb_conversions>
2879+
<revenue>Revenue</revenue>
2880+
</metricsGoal>
2881+
<processedMetricsGoal>
2882+
<revenue_per_visit>Revenue per Visit</revenue_per_visit>
2883+
</processedMetricsGoal>
2884+
<metricTypesGoal>
2885+
<revenue_per_visit>money</revenue_per_visit>
2886+
<nb_conversions>number</nb_conversions>
2887+
<conversion_rate>percent</conversion_rate>
2888+
<revenue>money</revenue>
2889+
</metricTypesGoal>
28782890

28792891

28802892
<uniqueId>Referrers_getSocials</uniqueId>

‎tests/System/expected/test___API.getReportPagesMetadata_.xml‎

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,6 +2720,38 @@
27202720
<viewDataTable>tableGoals</viewDataTable>
27212721
<isReport>1</isReport>
27222722
</row>
2723+
<row>
2724+
<name>Social Networks</name>
2725+
<category>
2726+
<id>Goals by Referrers</id>
2727+
<name>Goals by Referrers</name>
2728+
<order>99</order>
2729+
<icon />
2730+
<help />
2731+
<widget />
2732+
</category>
2733+
<subcategory>
2734+
<id>Goals by Referrers</id>
2735+
<name>Goals by Referrers</name>
2736+
<order>99</order>
2737+
<help />
2738+
</subcategory>
2739+
<module>Referrers</module>
2740+
<action>getSocials</action>
2741+
<order>5</order>
2742+
<parameters>
2743+
<forceView>1</forceView>
2744+
<viewDataTable>tableGoals</viewDataTable>
2745+
<module>Referrers</module>
2746+
<action>getSocials</action>
2747+
<documentationForGoalsPage>1</documentationForGoalsPage>
2748+
<idGoal>0</idGoal>
2749+
</parameters>
2750+
<uniqueId>widgetReferrersgetSocialsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId>
2751+
<isWide>0</isWide>
2752+
<viewDataTable>tableGoals</viewDataTable>
2753+
<isReport>1</isReport>
2754+
</row>
27232755
<row>
27242756
<name>Campaigns</name>
27252757
<category>
@@ -2738,7 +2770,7 @@
27382770
</subcategory>
27392771
<module>Referrers</module>
27402772
<action>getCampaigns</action>
2741-
<order>5</order>
2773+
<order>6</order>
27422774
<parameters>
27432775
<forceView>1</forceView>
27442776
<viewDataTable>tableGoals</viewDataTable>
@@ -3798,6 +3830,39 @@
37983830
<viewDataTable>tableGoals</viewDataTable>
37993831
<isReport>1</isReport>
38003832
</row>
3833+
<row>
3834+
<name>Social Networks</name>
3835+
<category>
3836+
<id>Sales by Referrers</id>
3837+
<name>Sales by Referrers</name>
3838+
<order>99</order>
3839+
<icon />
3840+
<help />
3841+
<widget />
3842+
</category>
3843+
<subcategory>
3844+
<id>Sales by Referrers</id>
3845+
<name>Sales by Referrers</name>
3846+
<order>99</order>
3847+
<help />
3848+
</subcategory>
3849+
<module>Referrers</module>
3850+
<action>getSocials</action>
3851+
<order>5</order>
3852+
<parameters>
3853+
<forceView>1</forceView>
3854+
<viewDataTable>tableGoals</viewDataTable>
3855+
<module>Referrers</module>
3856+
<action>getSocials</action>
3857+
<documentationForGoalsPage>1</documentationForGoalsPage>
3858+
<idGoal>ecommerceOrder</idGoal>
3859+
<segmented_visitor_log_segment_suffix>visitEcommerceStatus==ordered</segmented_visitor_log_segment_suffix>
3860+
</parameters>
3861+
<uniqueId>widgetReferrersgetSocialsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrdersegmented_visitor_log_segment_suffixvisitEcommerceStatus3D3Dordered</uniqueId>
3862+
<isWide>0</isWide>
3863+
<viewDataTable>tableGoals</viewDataTable>
3864+
<isReport>1</isReport>
3865+
</row>
38013866
<row>
38023867
<name>Campaigns</name>
38033868
<category>
@@ -3816,7 +3881,7 @@
38163881
</subcategory>
38173882
<module>Referrers</module>
38183883
<action>getCampaigns</action>
3819-
<order>5</order>
3884+
<order>6</order>
38203885
<parameters>
38213886
<forceView>1</forceView>
38223887
<viewDataTable>tableGoals</viewDataTable>

‎tests/System/expected/test___API.getWidgetMetadata_.xml‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2696,7 +2696,7 @@
26962696
</subcategory>
26972697
<module>Referrers</module>
26982698
<action>getCampaigns</action>
2699-
<order>5</order>
2699+
<order>6</order>
27002700
<parameters>
27012701
<forceView>1</forceView>
27022702
<viewDataTable>tableGoals</viewDataTable>
@@ -2810,6 +2810,39 @@
28102810
<viewDataTable>tableGoals</viewDataTable>
28112811
<isReport>1</isReport>
28122812
</row>
2813+
<row>
2814+
<name>Sales by Referrers: Social Networks</name>
2815+
<category>
2816+
<id>Goals_Ecommerce</id>
2817+
<name>Ecommerce</name>
2818+
<order>20</order>
2819+
<icon>icon-reporting-ecommerce</icon>
2820+
<help />
2821+
<widget />
2822+
</category>
2823+
<subcategory>
2824+
<id>Ecommerce_Sales</id>
2825+
<name>Sales</name>
2826+
<order>15</order>
2827+
<help>&lt;p&gt;This section contains an extensive collection of reports to help you analyse the different conditions that most commonly lead to sales, such as the traffic and campaign sources, user time and location and devices used to access them.&lt;/p&gt;&lt;p&gt;You can also learn exactly how revenue is associated with each dimension, such as specific traffic types or tracked campaigns.&lt;/p&gt;</help>
2828+
</subcategory>
2829+
<module>Referrers</module>
2830+
<action>getSocials</action>
2831+
<order>5</order>
2832+
<parameters>
2833+
<forceView>1</forceView>
2834+
<viewDataTable>tableGoals</viewDataTable>
2835+
<module>Referrers</module>
2836+
<action>getSocials</action>
2837+
<documentationForGoalsPage>1</documentationForGoalsPage>
2838+
<idGoal>ecommerceOrder</idGoal>
2839+
<segmented_visitor_log_segment_suffix>visitEcommerceStatus==ordered</segmented_visitor_log_segment_suffix>
2840+
</parameters>
2841+
<uniqueId>widgetReferrersgetSocialsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrdersegmented_visitor_log_segment_suffixvisitEcommerceStatus3D3Dordered</uniqueId>
2842+
<isWide>0</isWide>
2843+
<viewDataTable>tableGoals</viewDataTable>
2844+
<isReport>1</isReport>
2845+
</row>
28132846
<row>
28142847
<name>Sales by Referrers: Websites</name>
28152848
<category>
@@ -3127,32 +3160,4 @@
31273160
</row>
31283161
</widgets>
31293162
</row>
3130-
<row>
3131-
<name>Pie graph</name>
3132-
<category>
3133-
<id>ExampleUI_UiFramework</id>
3134-
<name>UI Framework</name>
3135-
<order>90</order>
3136-
<icon />
3137-
<help />
3138-
<widget />
3139-
</category>
3140-
<subcategory>
3141-
<id>Pie graph</id>
3142-
<name>Pie graph</name>
3143-
<order>99</order>
3144-
<help />
3145-
</subcategory>
3146-
<module>ExampleUI</module>
3147-
<action>getPlanetRatios</action>
3148-
<order>212</order>
3149-
<parameters>
3150-
<module>ExampleUI</module>
3151-
<action>getPlanetRatios</action>
3152-
</parameters>
3153-
<uniqueId>widgetExampleUIgetPlanetRatios</uniqueId>
3154-
<isWide>0</isWide>
3155-
<viewDataTable>graphPie</viewDataTable>
3156-
<isReport>1</isReport>
3157-
</row>
31583163
</result>

0 commit comments

Comments
 (0)