Merge pull request #715 from matomo-org/fix-broken-builds

Correcting expected results
matomo-org · Nov 12, 2023 · 690bed3 · 690bed3
2 parents e47ed3b + 42c32b5
commit 690bed3
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/tests/Integration/Model/TagTest.php b/tests/Integration/Model/TagTest.php
@@ -275,7 +275,7 @@ public function testAddContainerTagSuccessMinimal()
                                         ],
                                     'availableValues' => null,
                                     'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
-                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/'). '">Learn more</a>',
+                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.TagManager.getParameters'). '">Learn more</a>',
                                     'introduction' => null,
                                     'condition' => null,
                                     'fullWidth' => false,
@@ -370,7 +370,7 @@ public function testAddContainerTagSuccessFull()
                                         ],
                                     'availableValues' => null,
                                     'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
-                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/') . '">Learn more</a>',
+                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.TagManager.getParameters') . '">Learn more</a>',
                                     'introduction' => null,
                                     'condition' => null,
                                     'fullWidth' => false,
@@ -561,7 +561,7 @@ public function testUpdateContainerTagSuccess()
                                     ],
                                 'availableValues' => null,
                                 'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
-                                'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/') . '">Learn more</a>',
+                                'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.TagManager.getParameters') . '">Learn more</a>',
                                 'introduction' => null,
                                 'condition' => null,
                                 'fullWidth' => false,
@@ -812,7 +812,7 @@ public function testUpdateParametersSuccess()
                                         ],
                                     'availableValues' => null,
                                     'description' => 'This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.',
-                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/') . '">Learn more</a>',
+                                    'inlineHelp' => '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.TagManager.getParameters') . '">Learn more</a>',
                                     'introduction' => null,
                                     'condition' => null,
                                     'fullWidth' => false,

diff --git a/tests/System/expected/test_dev_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_dev_with_content__TagManager.getContainerInstallInstructions.xml
@@ -12,6 +12,6 @@
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
-		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>
+        <helpUrl>https://developer.matomo.org/guides/tagmanager/embedding?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getInstallInstructions</helpUrl>
 	</row>
 </result>
diff --git a/tests/System/expected/test_live_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_live_with_content__TagManager.getContainerInstallInstructions.xml
@@ -12,6 +12,6 @@
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
-		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>
+        <helpUrl>https://developer.matomo.org/guides/tagmanager/embedding?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getInstallInstructions</helpUrl>
 	</row>
 </result>
diff --git a/tests/System/expected/test_no_such_release__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_no_such_release__TagManager.getContainerInstallInstructions.xml
@@ -12,6 +12,6 @@
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
-		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>
+        <helpUrl>https://developer.matomo.org/guides/tagmanager/embedding?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getInstallInstructions</helpUrl>
 	</row>
 </result>
diff --git a/...System/expected/test_stating_with_content__TagManager.getContainerInstallInstructions.xml b/...System/expected/test_stating_with_content__TagManager.getContainerInstallInstructions.xml
@@ -12,6 +12,6 @@
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
-		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>
+        <helpUrl>https://developer.matomo.org/guides/tagmanager/embedding?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getInstallInstructions</helpUrl>
 	</row>
 </result>
diff --git a/tests/System/expected/test_tag1__TagManager.getContainerTag.xml b/tests/System/expected/test_tag1__TagManager.getContainerTag.xml
@@ -50,7 +50,7 @@
 				</uiControlAttributes>
 				<availableValues />
 				<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
-				<inlineHelp>&lt;a href=&quot;https://matomo.org/faq/tag-manager/faq_26815/&quot;&gt;Learn more&lt;/a&gt;</inlineHelp>
+				<inlineHelp>&lt;a href="https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters"&gt;Learn more&lt;/a&gt;</inlineHelp>
 				<introduction />
 				<condition />
 				<fullWidth>0</fullWidth>

diff --git a/tests/System/expected/test_tag2__TagManager.getContainerTag.xml b/tests/System/expected/test_tag2__TagManager.getContainerTag.xml
@@ -51,7 +51,7 @@
 				</uiControlAttributes>
 				<availableValues />
 				<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
-				<inlineHelp>&lt;a href=&quot;https://matomo.org/faq/tag-manager/faq_26815/&quot;&gt;Learn more&lt;/a&gt;</inlineHelp>
+				<inlineHelp>&lt;a href="https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters"&gt;Learn more&lt;/a&gt;</inlineHelp>
 				<introduction />
 				<condition />
 				<fullWidth>0</fullWidth>

diff --git a/tests/System/expected/test_webContext__TagManager.getAvailableTagTypesInContext.xml b/tests/System/expected/test_webContext__TagManager.getAvailableTagTypesInContext.xml
@@ -1177,7 +1177,7 @@
 						</uiControlAttributes>
 						<availableValues />
 						<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
-						<inlineHelp>&lt;a href=&quot;https://matomo.org/faq/tag-manager/faq_26815/&quot;&gt;Learn more&lt;/a&gt;</inlineHelp>
+						<inlineHelp>&lt;a href="https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters"&gt;Learn more&lt;/a&gt;</inlineHelp>
 						<introduction />
 						<condition />
 						<fullWidth>0</fullWidth>

diff --git a/tests/System/expected/test_webContext__TagManager.getAvailableVariableTypesInContext.xml b/tests/System/expected/test_webContext__TagManager.getAvailableVariableTypesInContext.xml
@@ -1223,7 +1223,7 @@
 						</uiControlAttributes>
 						<availableValues />
 						<description>By default, Matomo accesses some information from the visitor’s browser like the browser resolution. Some privacy regulations may allow access of such information from the visitor’s device only after having a consent. If this applies to you, you can disable this feature.</description>
-						<inlineHelp>&lt;br&gt;&lt;strong&gt;To learn more, check this &lt;a href=&quot;https://matomo.org/faq/how-to/how-do-i-disable-browser-feature-detection-completely/&quot; target=&quot;_blank&quot; rel=&quot;noreferrer noopener&quot;&gt;FAQ&lt;/a&gt;.&lt;/strong&gt;</inlineHelp>
+						<inlineHelp>&lt;br&gt;&lt;strong&gt;To learn more, check this &lt;a href="https://matomo.org/faq/how-to/how-do-i-disable-browser-feature-detection-completely/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters" target="_blank" rel="noreferrer noopener"&gt;FAQ&lt;/a&gt;.&lt;/strong&gt;</inlineHelp>
 						<introduction />
 						<condition />
 						<fullWidth>0</fullWidth>

diff --git a/tests/System/expected/test_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_with_content__TagManager.getContainerInstallInstructions.xml
@@ -12,6 +12,6 @@
   })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
-		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>
+        <helpUrl>https://developer.matomo.org/guides/tagmanager/embedding?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getInstallInstructions</helpUrl>
 	</row>
 </result>
diff --git a/tests/System/expected/test_with_content__TagManager.getContainerTags.xml b/tests/System/expected/test_with_content__TagManager.getContainerTags.xml
@@ -52,7 +52,7 @@
 					</uiControlAttributes>
 					<availableValues />
 					<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
-					<inlineHelp>&lt;a href=&quot;https://matomo.org/faq/tag-manager/faq_26815/&quot;&gt;Learn more&lt;/a&gt;</inlineHelp>
+					<inlineHelp>&lt;a href="https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters"&gt;Learn more&lt;/a&gt;</inlineHelp>
 					<introduction />
 					<condition />
 					<fullWidth>0</fullWidth>
@@ -136,7 +136,7 @@
 					</uiControlAttributes>
 					<availableValues />
 					<description>This tag is ideal when you need to add for example custom styles or custom JavaScript or when you are looking for a specific tag which is not yet supported. With this tag you can append any HTML to the bottom of your page, add styles, or execute JavaScript. Note: You can replace content within the HTML with variables by putting a variable name in curly brackets like this {{PageUrl}}.</description>
-					<inlineHelp>&lt;a href=&quot;https://matomo.org/faq/tag-manager/faq_26815/&quot;&gt;Learn more&lt;/a&gt;</inlineHelp>
+					<inlineHelp>&lt;a href="https://matomo.org/faq/tag-manager/faq_26815/?mtm_campaign=Matomo_App&amp;mtm_source=Matomo_App_OnPremise&amp;mtm_medium=App.TagManager.getParameters"&gt;Learn more&lt;/a&gt;</inlineHelp>
 					<introduction />
 					<condition />
 					<fullWidth>0</fullWidth>