refs #6705 this fixes a couple of tests, especially should we not call mergeChildren as it would change the dataTable

3 files changed, 7 insertions, 8 deletions

diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index cbd7ddab35..55696873be 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -76,7 +76,7 @@ class Get extends \Piwik\Plugin\Report
 
         if (!empty($response['reportData'])) {
             $dataTable = $response['reportData'];
-            $dataTable->deleteColumn($this->usersColumn);
+            $dataTable->deleteColumn($this->usersColumn, true);
         }
     }
 
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index 5db1cb33e7..f0e7215aac 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -49,19 +49,19 @@ class VisitsSummary extends \Piwik\Plugin
         $module  = $params[3];
         $method  = $params[4];
 
-        /** @var DataTable|DataTable\Map $dataTable */
-        $dataTable = $response['reportData'];
-
         if (!$this->isRequestingVisitsSummaryGet($module, $method)) {
             return;
         }
 
         $userId = new UserId();
 
+        /** @var DataTable|DataTable\Map $dataTable */
+        $dataTable = $response['reportData'];
+
         if (!$userId->hasDataTableUsers($dataTable) &&
             !$userId->isUsedInAtLeastOneSite($idSites, $period, $date)) {
             $report = new Get();
-            $report->removeUsersFromProcessedReport($response, $dataTable);
+            $report->removeUsersFromProcessedReport($response);
         }
     }
 
diff --git a/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php
index cc30bbc345..cba68a8cad 100644
--- a/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php
+++ b/plugins/VisitsSummary/tests/Integration/VisitsSummaryTest.php
@@ -41,7 +41,6 @@ class VisitsSummaryTest extends IntegrationTestCase
 
         Fixture::createSuperUser();
         Fixture::createWebsite('2014-01-01 00:00:00');
-        Fixture::createWebsite('2014-01-01 00:00:00');
     }
 
     public function tearDown()
@@ -60,7 +59,7 @@ class VisitsSummaryTest extends IntegrationTestCase
 
         $response = $this->requestProcessedGetReport();
 
-        $this->assertUsersNotRemovedFromProcessedReport($response, $expectedUsers = 2);
+        $this->assertUsersNotRemovedFromProcessedReport($response, $expectedUsers = 2.0);
     }
 
     public function test_enrichProcessedReportIfVisitsSummaryGet_shouldNotRemoveUsers_IfNoneWereTrackedThatDay_ButThatMonth()
@@ -88,7 +87,7 @@ class VisitsSummaryTest extends IntegrationTestCase
     private function assertUsersNotRemovedFromProcessedReport($response, $numUsers)
     {
         $table = $response['reportData'];
-        $this->assertEquals(array($numUsers), $table->getColumn($this->column));
+        $this->assertSame(array($numUsers), $table->getColumn($this->column));
         $this->assertEquals(array(3), $table->getColumn('nb_visits'));
         $this->assertNotEmpty($response['metadata']['metrics'][$this->column]);
         $this->assertNotEmpty($response['metadata']['metricsDocumentation'][$this->column]);