Fix failing tests (#16629)

* updates expected test files

* fix ui test

4 files changed, 23 insertions, 23 deletions

diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
index 0b4b8ad96d..946407d4c8 100644
--- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
+++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc82d19a990194c727a088aed4dd2c9ba99734f9806bfe33b5c894be4e718b54
-size 260758
+oid sha256:7e4ac1b4f6062ecf0c3f675b58b859d8d1caef1b8eabb8214d4d8a325e00697e
+size 295334
diff --git a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
index d5febac4b9..508dfbe26f 100644
--- a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
+++ b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js
@@ -256,10 +256,10 @@ describe("DeactivatedFeatures", function () {
         await page.goto("?module=CoreAdminHome&action=generalSettings");
         await page.waitForNetworkIdle();
 
-        const log = await page.$('#LivePluginSettings #activate_visitor_log');
+        const log = await page.$('#LivePluginSettings #disable_visitor_log');
         expect(log).to.be.ok;
 
-        const profile = await page.$('#LivePluginSettings #activate_visitor_profile');
+        const profile = await page.$('#LivePluginSettings #disable_visitor_profile');
         expect(profile).to.be.ok;
     });
 
@@ -268,10 +268,10 @@ describe("DeactivatedFeatures", function () {
         await page.reload();
         await page.waitForNetworkIdle();
 
-        const log = await page.$('#LivePluginSettings #activate_visitor_log');
+        const log = await page.$('#LivePluginSettings #disable_visitor_log');
         expect(log).to.be.not.ok;
 
-        const profile = await page.$('#LivePluginSettings #activate_visitor_profile');
+        const profile = await page.$('#LivePluginSettings #disable_visitor_profile');
         expect(profile).to.be.not.ok;
     });
 
@@ -281,10 +281,10 @@ describe("DeactivatedFeatures", function () {
         await page.click('[idsite="1"] .icon-edit');
         await page.waitForNetworkIdle();
 
-        const log = await page.$('[idsite="1"] #activate_visitor_log');
+        const log = await page.$('[idsite="1"] #disable_visitor_log');
         expect(log).to.be.ok;
 
-        const profile = await page.$('[idsite="1"] #activate_visitor_profile');
+        const profile = await page.$('[idsite="1"] #disable_visitor_profile');
         expect(profile).to.be.ok;
     });
 
@@ -295,10 +295,10 @@ describe("DeactivatedFeatures", function () {
         await page.click('[idsite="1"] .icon-edit');
         await page.waitForNetworkIdle();
 
-        const log = await page.$('[idsite="1"] #activate_visitor_log');
+        const log = await page.$('[idsite="1"] #disable_visitor_log');
         expect(log).to.be.not.ok;
 
-        const profile = await page.$('[idsite="1"] #activate_visitor_profile');
+        const profile = await page.$('[idsite="1"] #disable_visitor_profile');
         expect(profile).to.be.not.ok;
     });
 
diff --git a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html
index bb922e6162..79c4ba7fec 100644
--- a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html
+++ b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html
@@ -80,7 +80,7 @@
                 <th>{{ 'General_VisitorIP'|translate }}</th>
                 <th>{{ 'General_UserId'|translate }}</th>
                 <th>{{ 'General_Details'|translate }}</th>
-                <th ng-show="managerGdpr.profileEnabled">{{ 'General_Action'|translate }}</th>
+                <th ng-show="manageGdpr.profileEnabled">{{ 'General_Action'|translate }}</th>
             </tr>
             </thead>
             <tbody>
@@ -105,7 +105,7 @@
                         <span title="{{ dataSubject.browser }} {{ dataSubject.browserFamilyDescription }}"><img height="16" ng-src="{{ dataSubject.browserIcon }}"></span>
                         <span title="{{ dataSubject.country }} {{ dataSubject.region }}"><img height="16" ng-src="{{ dataSubject.countryFlag }}"></span>
                     </td>
-                    <td ng-show="managerGdpr.profileEnabled"><a class="visitorLogTooltip" title="View visitor profile" ng-click="manageGdpr.showProfile(dataSubject.visitorId, dataSubject.idSite)">
+                    <td ng-show="manageGdpr.profileEnabled"><a class="visitorLogTooltip" title="View visitor profile" ng-click="manageGdpr.showProfile(dataSubject.visitorId, dataSubject.idSite)">
                     <img src="plugins/Live/images/visitorProfileLaunch.png"> <span>{{ 'Live_ViewVisitorProfile'|translate }}</span>
                 </a></td>
                 </tr>
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
index c9e85a2f5c..0fd12d6bff 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -223,36 +223,36 @@ https://www.example.org/</placeholder>
 		<title>Live</title>
 		<settings>
 			<row>
-				<name>activate_visitor_log</name>
-				<title>Enable visits log</title>
-				<value>1</value>
-				<defaultValue>1</defaultValue>
+				<name>disable_visitor_log</name>
+				<title>Disable visits log &amp; visitor profile</title>
+				<value>0</value>
+				<defaultValue>0</defaultValue>
 				<type>boolean</type>
 				<uiControl>checkbox</uiControl>
 				<uiControlAttributes>
 				</uiControlAttributes>
 				<availableValues />
 				<description />
-				<inlineHelp />
+				<inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp>
 				<templateFile />
 				<introduction />
 				<condition />
 			</row>
 			<row>
-				<name>activate_visitor_profile</name>
-				<title>Enable visitor profile</title>
-				<value>1</value>
-				<defaultValue>1</defaultValue>
+				<name>disable_visitor_profile</name>
+				<title>Disable visitor profile only</title>
+				<value>0</value>
+				<defaultValue>0</defaultValue>
 				<type>boolean</type>
 				<uiControl>checkbox</uiControl>
 				<uiControlAttributes>
 				</uiControlAttributes>
 				<availableValues />
 				<description />
-				<inlineHelp />
+				<inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp>
 				<templateFile />
 				<introduction />
-				<condition>activate_visitor_log==1</condition>
+				<condition>disable_visitor_log==0</condition>
 			</row>
 		</settings>
 	</row>