From f097211fb7815fe7dd3af068d39c857f964e3012 Mon Sep 17 00:00:00 2001
From: Lachlan Reynolds <lachlan.reynolds@innocraft.com>
Date: Tue, 2 Jun 2026 11:59:26 +1200
Subject: [PATCH 1/2] Fix system tests [no_release]

---
 .../test___Actions.getPageUrls_day.xml        |  5 ++--
 .../test___Actions.getPageUrls_year.xml       |  5 ++--
 ...mensions.getConfiguredCustomDimensions.xml |  6 ++---
 .../test___SitesManager.getSiteFromId.xml     | 27 -------------------
 4 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/tests/System/expected/test___Actions.getPageUrls_day.xml b/tests/System/expected/test___Actions.getPageUrls_day.xml
index 768a084..4c08979 100644
--- a/tests/System/expected/test___Actions.getPageUrls_day.xml
+++ b/tests/System/expected/test___Actions.getPageUrls_day.xml
@@ -69,13 +69,14 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>2541</revenue>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 					</row>
 					<row idgoal='ecommerceOrder'>
 						<nb_conversions>1</nb_conversions>
 						<revenue>2541</revenue>
 						<nb_conv_pages_before>2</nb_conv_pages_before>
 						<nb_conversions_attrib>0.5</nb_conversions_attrib>
-						<nb_conversions_page_rate>0</nb_conversions_page_rate>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 						<revenue_attrib>1270.5</revenue_attrib>
 					</row>
@@ -84,7 +85,7 @@
 						<revenue>5</revenue>
 						<nb_conv_pages_before>2</nb_conv_pages_before>
 						<nb_conversions_attrib>0.5</nb_conversions_attrib>
-						<nb_conversions_page_rate>0</nb_conversions_page_rate>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 						<revenue_attrib>2.5</revenue_attrib>
 					</row>
diff --git a/tests/System/expected/test___Actions.getPageUrls_year.xml b/tests/System/expected/test___Actions.getPageUrls_year.xml
index db8d6f1..23f9031 100644
--- a/tests/System/expected/test___Actions.getPageUrls_year.xml
+++ b/tests/System/expected/test___Actions.getPageUrls_year.xml
@@ -66,13 +66,14 @@
 						<nb_conversions>1</nb_conversions>
 						<revenue>2541</revenue>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 					</row>
 					<row idgoal='ecommerceOrder'>
 						<nb_conversions>1</nb_conversions>
 						<revenue>2541</revenue>
 						<nb_conv_pages_before>2</nb_conv_pages_before>
 						<nb_conversions_attrib>0.5</nb_conversions_attrib>
-						<nb_conversions_page_rate>0</nb_conversions_page_rate>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 						<revenue_attrib>1270.5</revenue_attrib>
 					</row>
@@ -81,7 +82,7 @@
 						<revenue>5</revenue>
 						<nb_conv_pages_before>2</nb_conv_pages_before>
 						<nb_conversions_attrib>0.5</nb_conversions_attrib>
-						<nb_conversions_page_rate>0</nb_conversions_page_rate>
+						<nb_conversions_page_rate>1</nb_conversions_page_rate>
 						<nb_conversions_page_uniq>1</nb_conversions_page_uniq>
 						<revenue_attrib>2.5</revenue_attrib>
 					</row>
diff --git a/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml b/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml
index e665db8..f01cb8e 100644
--- a/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml
+++ b/tests/System/expected/test___CustomDimensions.getConfiguredCustomDimensions.xml
@@ -4,7 +4,7 @@
 		<idcustomdimension>1</idcustomdimension>
 		<idsite>1</idsite>
 		<name>MyName1</name>
-		<description/>
+		<description />
 		<index>1</index>
 		<scope>visit</scope>
 		<active>1</active>
@@ -16,7 +16,7 @@
 		<idcustomdimension>2</idcustomdimension>
 		<idsite>1</idsite>
 		<name>MyName2</name>
-		<description/>
+		<description />
 		<index>1</index>
 		<scope>action</scope>
 		<active>1</active>
@@ -28,7 +28,7 @@
 		<idcustomdimension>3</idcustomdimension>
 		<idsite>1</idsite>
 		<name>MyName3</name>
-		<description/>
+		<description />
 		<index>2</index>
 		<scope>action</scope>
 		<active>0</active>
diff --git a/tests/System/expected/test___SitesManager.getSiteFromId.xml b/tests/System/expected/test___SitesManager.getSiteFromId.xml
index c3f4de8..e69de29 100644
--- a/tests/System/expected/test___SitesManager.getSiteFromId.xml
+++ b/tests/System/expected/test___SitesManager.getSiteFromId.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
-	<row>
-		<idsite>1</idsite>
-		<name>MigrationSite</name>
-		<description/>
-		<main_url>http://piwik.net</main_url>
-		<ts_created>2013-01-22 00:00:00</ts_created>
-		<ecommerce>1</ecommerce>
-		<sitesearch>1</sitesearch>
-		<sitesearch_keyword_parameters />
-		<sitesearch_category_parameters />
-		<timezone>UTC</timezone>
-		<currency>USD</currency>
-		<exclude_unknown_urls>0</exclude_unknown_urls>
-		<excluded_ips />
-		<excluded_parameters />
-		<excluded_user_agents />
-		<excluded_referrers />
-		<group />
-		<type>website</type>
-		<keep_url_fragment>0</keep_url_fragment>
-		<creator_login>superUserLogin</creator_login>
-		<timezone_name>UTC</timezone_name>
-		<currency_name>US Dollar</currency_name>
-	</row>
-</result>
\ No newline at end of file

From ce66eeffaaa25d2b7dd1b7fdccb968cbf62dd443 Mon Sep 17 00:00:00 2001
From: Lachlan Reynolds <lachlan.reynolds@innocraft.com>
Date: Wed, 3 Jun 2026 11:02:21 +1200
Subject: [PATCH 2/2] Add back in deleted test [no_release]

---
 .../test___SitesManager.getSiteFromId.xml     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/System/expected/test___SitesManager.getSiteFromId.xml b/tests/System/expected/test___SitesManager.getSiteFromId.xml
index e69de29..c3f4de8 100644
--- a/tests/System/expected/test___SitesManager.getSiteFromId.xml
+++ b/tests/System/expected/test___SitesManager.getSiteFromId.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<row>
+		<idsite>1</idsite>
+		<name>MigrationSite</name>
+		<description/>
+		<main_url>http://piwik.net</main_url>
+		<ts_created>2013-01-22 00:00:00</ts_created>
+		<ecommerce>1</ecommerce>
+		<sitesearch>1</sitesearch>
+		<sitesearch_keyword_parameters />
+		<sitesearch_category_parameters />
+		<timezone>UTC</timezone>
+		<currency>USD</currency>
+		<exclude_unknown_urls>0</exclude_unknown_urls>
+		<excluded_ips />
+		<excluded_parameters />
+		<excluded_user_agents />
+		<excluded_referrers />
+		<group />
+		<type>website</type>
+		<keep_url_fragment>0</keep_url_fragment>
+		<creator_login>superUserLogin</creator_login>
+		<timezone_name>UTC</timezone_name>
+		<currency_name>US Dollar</currency_name>
+	</row>
+</result>
\ No newline at end of file