diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-12-06 03:23:28 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-12-06 03:23:28 +0300 |
| commit | 8f079b21b1f635a6bb9bbbdfd8396001fc2bdfa3 (patch) | |
| tree | 5a6646f966caba4c02803238998a0312180efc04 /plugins/Live | |
| parent | 814f3790741fce0843d3074e77bf785aaccb88a6 (diff) | |
Prefix tables in expected strings (travis runs without prefix)
Diffstat (limited to 'plugins/Live')
| -rw-r--r-- | plugins/Live/tests/System/ModelTest.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/Live/tests/System/ModelTest.php b/plugins/Live/tests/System/ModelTest.php index 268a7861d4..80f1c8d86f 100644 --- a/plugins/Live/tests/System/ModelTest.php +++ b/plugins/Live/tests/System/ModelTest.php @@ -17,7 +17,8 @@ use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Integration\SegmentTest; /** - * @group LiveModelTest + * @group Live + * @group ModelTest * @group Plugins */ class ModelTest extends SystemTestCase @@ -44,7 +45,7 @@ class ModelTest extends SystemTestCase $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 @@ class ModelTest extends SystemTestCase 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 = ? |