Prefix tables in expected strings (travis runs without prefix)

d19dotca · Dec 6, 2014 · 8f079b2 · 8f079b2
1 parent 814f379
commit 8f079b2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/plugins/Live/tests/System/ModelTest.php b/plugins/Live/tests/System/ModelTest.php
@@ -17,7 +17,8 @@
 use Piwik\Tests\Integration\SegmentTest;
 
 /**
- * @group LiveModelTest
+ * @group Live
+ * @group ModelTest
  * @group Plugins
  */
 class ModelTest extends SystemTestCase
@@ -44,7 +45,7 @@ public function test_makeLogVisitsQueryString()
         $expectedSql = ' SELECT sub.* FROM
                 (
                     SELECT log_visit.*
-                    FROM piwiktests_log_visit AS log_visit
+                    FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
                     WHERE log_visit.idsite in (?)
                       AND log_visit.visit_last_action_time >= ?
                       AND log_visit.visit_last_action_time <= ?
@@ -83,8 +84,8 @@ public function test_makeLogVisitsQueryString_whenSegment()
                     SELECT log_inner.*
                     FROM (
                         SELECT log_visit.*
-                        FROM piwiktests_log_visit AS log_visit
-                          LEFT JOIN piwiktests_log_link_visit_action AS log_link_visit_action
+                        FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
+                          LEFT JOIN ' . Common::prefixTable('log_link_visit_action') . ' AS log_link_visit_action
                           ON log_link_visit_action.idvisit = log_visit.idvisit
                         WHERE ( log_visit.idsite in (?)
                           AND log_visit.idvisitor = ?