fix system tests and fix an error where we did not pass the correct siteId when saving measurable settings

5 files changed, 28 insertions, 12 deletions

diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 4a67c45c2c..9a6bf63469 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -585,7 +585,7 @@ class API extends \Piwik\Plugin\API
         }
 
         if (!empty($settings)) {
-            $this->validateMeasurableSettings($bind['type'], $settings);
+            $this->validateMeasurableSettings(0, $bind['type'], $settings);
         }
 
         $idSite = $this->getModel()->createSite($bind);
@@ -611,9 +611,9 @@ class API extends \Piwik\Plugin\API
         return (int) $idSite;
     }
 
-    private function validateMeasurableSettings($idType, $settings)
+    private function validateMeasurableSettings($idSite, $idType, $settings)
     {
-        $measurableSettings = new MeasurableSettings(0, $idType);
+        $measurableSettings = new MeasurableSettings($idSite, $idType);
 
         foreach ($measurableSettings->getSettingsForCurrentUser() as $measurableSetting) {
             $name = $measurableSetting->getName();
@@ -1184,7 +1184,7 @@ class API extends \Piwik\Plugin\API
         }
 
         if (!empty($settings)) {
-            $this->validateMeasurableSettings(Site::getTypeFor($idSite), $settings);
+            $this->validateMeasurableSettings($idSite, Site::getTypeFor($idSite), $settings);
         }
 
         $this->getModel()->updateSite($bind, $idSite);
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomDimensions.getAvailableScopes.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomDimensions.getAvailableScopes.xml
index 6df7142c16..149cf8b31c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomDimensions.getAvailableScopes.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomDimensions.getAvailableScopes.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>visit</name>
+		<value>visit</value>
+		<name>Visit</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>0</supportsExtractions>
 	</row>
 	<row>
-		<name>action</name>
+		<value>action</value>
+		<name>Action</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>1</supportsExtractions>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomDimensions.getAvailableScopes.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomDimensions.getAvailableScopes.xml
index 6df7142c16..149cf8b31c 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomDimensions.getAvailableScopes.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CustomDimensions.getAvailableScopes.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>visit</name>
+		<value>visit</value>
+		<name>Visit</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>0</supportsExtractions>
 	</row>
 	<row>
-		<name>action</name>
+		<value>action</value>
+		<name>Action</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>1</supportsExtractions>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomDimensions.getAvailableScopes.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomDimensions.getAvailableScopes.xml
index 6df7142c16..149cf8b31c 100644
--- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomDimensions.getAvailableScopes.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CustomDimensions.getAvailableScopes.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>visit</name>
+		<value>visit</value>
+		<name>Visit</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>0</supportsExtractions>
 	</row>
 	<row>
-		<name>action</name>
+		<value>action</value>
+		<name>Action</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>1</supportsExtractions>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_noVisit__CustomDimensions.getAvailableScopes.xml b/tests/PHPUnit/System/expected/test_noVisit__CustomDimensions.getAvailableScopes.xml
index 6df7142c16..149cf8b31c 100644
--- a/tests/PHPUnit/System/expected/test_noVisit__CustomDimensions.getAvailableScopes.xml
+++ b/tests/PHPUnit/System/expected/test_noVisit__CustomDimensions.getAvailableScopes.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<name>visit</name>
+		<value>visit</value>
+		<name>Visit</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>0</supportsExtractions>
 	</row>
 	<row>
-		<name>action</name>
+		<value>action</value>
+		<name>Action</name>
 		<numSlotsAvailable>5</numSlotsAvailable>
 		<numSlotsUsed>0</numSlotsUsed>
 		<numSlotsLeft>5</numSlotsLeft>
+		<supportsExtractions>1</supportsExtractions>
 	</row>
 </result>
\ No newline at end of file