diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-12 13:54:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 13:54:03 +0300 |
| commit | 53454e8efd0ab2a03dd9bb9f837aa63f36cfe552 (patch) | |
| tree | be7dc483dad0dcac6577b73e9e82ede7bc097682 /tests/PHPUnit | |
| parent | b1c09fa5123155ab9cd79342a4a0cef42e80de7f (diff) | |
| parent | 67f2661f24602a07ebee66172f8446887ab83787 (diff) | |
Merge pull request #10994 from piwik/3.x-dev3.0.0-rc2
3.0.0-rc2 release
Diffstat (limited to 'tests/PHPUnit')
32 files changed, 551 insertions, 390 deletions
diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php index 4fb569b9d8..c11f4e3476 100644 --- a/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php +++ b/tests/PHPUnit/Framework/Mock/Settings/FakeMeasurableSettings.php @@ -28,9 +28,5 @@ class FakeMeasurableSettings extends \Piwik\Plugins\ExampleSettingsPlugin\Measur return parent::makeProperty($name, $defaultValue, $type, $configureCallback); } - public function addSetting(Setting $setting) - { - parent::addSetting($setting); - } } diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php index 00b9554196..735b3f9dc2 100644 --- a/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php +++ b/tests/PHPUnit/Framework/Mock/Settings/FakeSystemSettings.php @@ -28,9 +28,5 @@ class FakeSystemSettings extends \Piwik\Plugins\ExampleSettingsPlugin\SystemSett return parent::makeSetting($name, $defaultValue, $type, $configureCallback); } - public function addSetting(Setting $setting) - { - parent::addSetting($setting); - } } diff --git a/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php b/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php index 9d4bb5fdb1..fc77c85346 100644 --- a/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php +++ b/tests/PHPUnit/Framework/Mock/Settings/FakeUserSettings.php @@ -23,9 +23,5 @@ class FakeUserSettings extends \Piwik\Plugins\ExampleSettingsPlugin\UserSettings return parent::makeSetting($name, $defaultValue, $type, $configureCallback); } - public function addSetting(Setting $setting) - { - parent::addSetting($setting); - } } diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index 823b6037be..afa068bdf4 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -55,6 +55,13 @@ class HttpTest extends \PHPUnit_Framework_TestCase $this->assertGreaterThan(0, filesize($destinationPath)); } + public function testBuildQuery() + { + $this->assertEquals('', Http::buildQuery(array())); + $this->assertEquals('test=foo', Http::buildQuery(array('test' => 'foo'))); + $this->assertEquals('test=foo&bar=baz', Http::buildQuery(array('test' => 'foo', 'bar' => 'baz'))); + } + /** * @dataProvider getMethodsToTest */ diff --git a/tests/PHPUnit/Integration/Settings/BaseSettingsTestCase.php b/tests/PHPUnit/Integration/Settings/BaseSettingsTestCase.php index 4a91af3a1c..2d56a0dce7 100644 --- a/tests/PHPUnit/Integration/Settings/BaseSettingsTestCase.php +++ b/tests/PHPUnit/Integration/Settings/BaseSettingsTestCase.php @@ -11,6 +11,7 @@ namespace Piwik\Tests\Integration\Settings; use Piwik\Db; use Piwik\Piwik; use Piwik\Settings\FieldConfig; +use Piwik\Settings\Setting; /** * @group PluginSettings @@ -122,4 +123,41 @@ class BaseSettingsTestCase extends IntegrationTestCase return $this->settings->makeSetting($name, $default = '', $type, function () {}); } + public function test_addSetting_shouldAddNewSetting() + { + $settingName = 'testSetting'; + $setting = $this->buildSetting($settingName); + $settings = $this->createSettingsInstance(); + + $this->assertEmpty($settings->getSetting($settingName)); + + $settings->addSetting($setting); + + $this->assertSame($setting, $settings->getSetting($settingName)); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage "testSetting" does already exist + */ + public function test_addSetting_throwsException_IfSameSettingAddedTwice() + { + $settingName = 'testSetting'; + $setting = $this->buildSetting($settingName); + $settings = $this->createSettingsInstance(); + + $settings->addSetting($setting); + $settings->addSetting($setting); + } + + private function buildSetting($name, $type = null, $default = '') + { + if (!isset($type)) { + $type = FieldConfig::TYPE_STRING; + } + + $userSetting = new Setting($name, $default, $type, 'MyPluginName'); + + return $userSetting; + } } diff --git a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingsTest.php b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingsTest.php index 689bab5d92..026aec7925 100644 --- a/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingsTest.php +++ b/tests/PHPUnit/Integration/Settings/Measurable/MeasurableSettingsTest.php @@ -12,8 +12,6 @@ use Piwik\Db; use Piwik\Plugins\WebsiteMeasurable\Type; use Piwik\Settings\Measurable\MeasurableSetting; use Piwik\Settings\Measurable\MeasurableSettings; -use Piwik\Settings\Plugin\UserSetting; -use Piwik\Settings\Plugin\UserSettings; use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\Mock\Settings\FakeMeasurableSettings; use Piwik\Tests\Integration\Settings\BaseSettingsTestCase; diff --git a/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php b/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php index fb25bbf13b..82acc03ec3 100644 --- a/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php +++ b/tests/PHPUnit/Integration/Settings/Storage/FactoryTest.php @@ -144,4 +144,14 @@ class FactoryTest extends IntegrationTestCase $this->assertSame('', $storage->getValue('mytest', $default = '', FieldConfig::TYPE_STRING)); } + public function test_makeStorage_returnsStorageWithGivenBackend() + { + $backend = new NullBackend('test'); + $storage = $this->factory->makeStorage($backend); + + $this->assertTrue($storage instanceof Storage); + + $this->assertSame($backend, $storage->getBackend()); + } + } diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index 9cc9faa5e0..3cfabafb6c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -179,6 +179,15 @@ <avg_event_value>0</avg_event_value> </row> <row> + <label>Purchase</label> + <nb_events>2</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + <row> <label>rating - La fiancée de l'eau</label> <nb_events>4</nb_events> <nb_events_with_value>4</nb_events_with_value> @@ -206,15 +215,6 @@ <avg_event_value>0</avg_event_value> </row> <row> - <label>Purchase</label> - <nb_events>2</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> - <row> <label>This is an event without a URL</label> <nb_events>1</nb_events> <nb_events_with_value>0</nb_events_with_value> @@ -361,6 +361,15 @@ <avg_event_value>0</avg_event_value> </row> <row> + <label>Purchase</label> + <nb_events>1</nb_events> + <nb_events_with_value>0</nb_events_with_value> + <sum_event_value>0</sum_event_value> + <min_event_value>0</min_event_value> + <max_event_value>0</max_event_value> + <avg_event_value>0</avg_event_value> + </row> + <row> <label>rating - La fiancée de l'eau</label> <nb_events>2</nb_events> <nb_events_with_value>2</nb_events_with_value> @@ -387,15 +396,6 @@ <max_event_value>0</max_event_value> <avg_event_value>0</avg_event_value> </row> - <row> - <label>Purchase</label> - <nb_events>1</nb_events> - <nb_events_with_value>0</nb_events_with_value> - <sum_event_value>0</sum_event_value> - <min_event_value>0</min_event_value> - <max_event_value>0</max_event_value> - <avg_event_value>0</avg_event_value> - </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> <result prettyDate="Wednesday, January 6, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml index e98af60cdc..3ba555ab1a 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml @@ -211,7 +211,7 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>sub/dir/dir1/page1.html</label> + <label>page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -222,22 +222,19 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> + <exit_rate>100%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/sub/dir/dir1/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> + <url>http://example.org/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> </row> <row> - <label>page1.html</label> + <label>sub/dir/dir1/page1.html</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> @@ -248,15 +245,18 @@ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> + <exit_rate>0%</exit_rate> <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> + <url>http://example.org/sub/dir/dir1/page1.html</url> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml index a26e381adb..711a38f887 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml @@ -30,6 +30,28 @@ <is_aggregate>1</is_aggregate> </row> <row> + <label>CustomVarVisit - CustomVarValue1</label> + <nb_visits>3</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>3</max_actions> + <sum_visit_length>3</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <is_aggregate>0</is_aggregate> + </row> + <row> + <label>CustomVarVisit - CustomVarValue2</label> + <nb_visits>3</nb_visits> + <nb_actions>9</nb_actions> + <nb_users>0</nb_users> + <max_actions>3</max_actions> + <sum_visit_length>3</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <is_aggregate>0</is_aggregate> + </row> + <row> <label>CustomVarPage - CustomVarValue0</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> @@ -47,30 +69,19 @@ <nb_actions>6</nb_actions> <is_aggregate>0</is_aggregate> </row> + </result> + <result date="2010-03-06"> <row> <label>CustomVarVisit - CustomVarValue1</label> - <nb_visits>3</nb_visits> - <nb_actions>9</nb_actions> - <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarVisit - CustomVarValue2</label> - <nb_visits>3</nb_visits> - <nb_actions>9</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> <nb_users>0</nb_users> - <max_actions>3</max_actions> - <sum_visit_length>3</sum_visit_length> + <max_actions>2</max_actions> + <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <is_aggregate>0</is_aggregate> </row> - </result> - <result date="2010-03-06"> <row> <label>CustomVarVisit</label> <nb_visits>1</nb_visits> @@ -89,6 +100,12 @@ <is_aggregate>1</is_aggregate> </row> <row> + <label>CustomVarPage - CustomVarValue1</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <is_aggregate>0</is_aggregate> + </row> + <row> <label>CustomVarPage</label> <nb_actions>1</nb_actions> <slots> @@ -99,23 +116,6 @@ </slots> <is_aggregate>1</is_aggregate> </row> - <row> - <label>CustomVarPage - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <is_aggregate>0</is_aggregate> - </row> - <row> - <label>CustomVarVisit - CustomVarValue1</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>2</max_actions> - <sum_visit_length>1</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <is_aggregate>0</is_aggregate> - </row> </result> <result date="2010-03-07" /> <result date="2010-03-08" /> diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml index 760c5bb869..155db4a5b8 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml @@ -25,6 +25,54 @@ <is_aggregate>1</is_aggregate> </row> <row> + <label>dir1/sub</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.3</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> + <label>dir1/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.1</min_time_generation> + <max_time_generation>0.6</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.3</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>dir2</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> @@ -49,13 +97,13 @@ <is_aggregate>1</is_aggregate> </row> <row> - <label>dir3</label> + <label>dir2/sub</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -69,64 +117,65 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> + <avg_time_generation>0.6</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>page1.html</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <label>dir2/sub/dir</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation /> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.2</min_time_generation> + <max_time_generation>1.2</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <exit_nb_visits>1</exit_nb_visits> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>100%</exit_rate> - <avg_time_generation>0</avg_time_generation> - <url>http://example.org/page1.html</url> - <is_aggregate>0</is_aggregate> - <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.6</avg_time_generation> + <is_aggregate>1</is_aggregate> </row> <row> - <label>sub</label> - <nb_visits>1</nb_visits> - <nb_hits>1</nb_hits> + <label>dir3</label> + <nb_visits>6</nb_visits> + <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>0</nb_hits_with_time_generation> - <min_time_generation /> - <max_time_generation>0</max_time_generation> + <nb_hits_with_time_generation>6</nb_hits_with_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>2</entry_nb_actions> - <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>6</entry_nb_actions> + <entry_sum_visit_length>2</entry_sum_visit_length> <entry_bounce_count>0</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> - <exit_rate>0%</exit_rate> - <avg_time_generation>0</avg_time_generation> + <exit_rate>33%</exit_rate> + <avg_time_generation>0.9</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir1/sub</label> + <label>dir3/sub</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -140,17 +189,17 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> + <avg_time_generation>0.9</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> - <label>dir1/sub/dir</label> + <label>dir3/sub/dir</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> <sum_time_spent>0</sum_time_spent> <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.1</min_time_generation> - <max_time_generation>0.6</max_time_generation> + <min_time_generation>0.3</min_time_generation> + <max_time_generation>1.8</max_time_generation> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> @@ -164,7 +213,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>0%</bounce_rate> <exit_rate>33%</exit_rate> - <avg_time_generation>0.3</avg_time_generation> + <avg_time_generation>0.9</avg_time_generation> <is_aggregate>1</is_aggregate> </row> <row> @@ -241,54 +290,6 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>dir2/sub</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> - <label>dir2/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.2</min_time_generation> - <max_time_generation>1.2</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.6</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>dir2/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -362,54 +363,6 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> - <label>dir3/sub</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> - <label>dir3/sub/dir</label> - <nb_visits>6</nb_visits> - <nb_hits>6</nb_hits> - <sum_time_spent>0</sum_time_spent> - <nb_hits_with_time_generation>6</nb_hits_with_time_generation> - <min_time_generation>0.3</min_time_generation> - <max_time_generation>1.8</max_time_generation> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>2</entry_nb_visits> - <entry_nb_actions>6</entry_nb_actions> - <entry_sum_visit_length>2</entry_sum_visit_length> - <entry_bounce_count>0</entry_bounce_count> - <exit_nb_visits>2</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>0%</bounce_rate> - <exit_rate>33%</exit_rate> - <avg_time_generation>0.9</avg_time_generation> - <is_aggregate>1</is_aggregate> - </row> - <row> <label>dir3/sub/dir/page0.html</label> <nb_visits>2</nb_visits> <nb_hits>2</nb_hits> @@ -483,6 +436,53 @@ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment> </row> <row> + <label>page1.html</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation /> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <exit_nb_visits>1</exit_nb_visits> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <url>http://example.org/page1.html</url> + <is_aggregate>0</is_aggregate> + <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment> + </row> + <row> + <label>sub</label> + <nb_visits>1</nb_visits> + <nb_hits>1</nb_hits> + <sum_time_spent>0</sum_time_spent> + <nb_hits_with_time_generation>0</nb_hits_with_time_generation> + <min_time_generation /> + <max_time_generation>0</max_time_generation> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>1</entry_sum_visit_length> + <entry_bounce_count>0</entry_bounce_count> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>0%</bounce_rate> + <exit_rate>0%</exit_rate> + <avg_time_generation>0</avg_time_generation> + <is_aggregate>1</is_aggregate> + </row> + <row> <label>sub/dir</label> <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index fc64578e32..6008a52144 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -21,6 +21,7 @@ </availableValues> <description /> <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <templateFile /> <introduction>Release channel</introduction> <condition /> </row> @@ -39,6 +40,7 @@ </availableValues> <description /> <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <templateFile /> <introduction>Send an email when a plugin update is available</introduction> <condition /> </row> @@ -64,6 +66,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -91,6 +94,7 @@ </availableValues> <description>The value will be only displayed in the following browsers</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -108,6 +112,7 @@ Another line</defaultValue> <availableValues /> <description>This description will be displayed next to the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -123,6 +128,7 @@ Another line</defaultValue> <availableValues /> <description>Password for the 3rd API where we fetch the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -144,6 +150,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, logged in users can opt out in their plugin settings. Anonymous users cannot opt out.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -159,6 +166,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description> <inlineHelp /> + <templateFile /> <introduction>Send anonmyized usage data to the creators of Piwik</introduction> <condition /> </row> @@ -174,6 +182,7 @@ Another line</defaultValue> <availableValues /> <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to this Piwik</introduction> <condition /> </row> @@ -189,6 +198,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -205,6 +215,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to a custom Piwik</introduction> <condition /> </row> @@ -221,6 +232,7 @@ Another line</defaultValue> <availableValues /> <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -236,6 +248,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -258,6 +271,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -274,6 +288,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -290,6 +305,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -306,6 +322,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -322,6 +339,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>In case you are using Redis for caching make sure to use a different database.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -338,6 +356,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Password set on the Redis server, if any. Redis can be instructed to require a password before allowing clients to execute commands.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -353,6 +372,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, all tracking requests will be written into a queue instead of the directly into the database. Requires a Redis server and phpredis PHP extension.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -369,6 +389,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Number of allowed maximum queue workers. Accepts a number between 1 and 16. Best practice is to set the number of CPUs you want to make available for queue processing. Be aware you need to make sure to start the workers manually. We recommend to not use 9-15 workers, rather use 8 or 16 as the queue might not be distributed evenly into different queues. DO NOT USE more than 1 worker if you make use the UserId feature when tracking see https://github.com/piwik/piwik/issues/7691</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -385,6 +406,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Defines how many requests will be picked out of the queue and processed at once. Enter a number which is >= 1.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -400,6 +422,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, we will process all requests within a queue during a normal tracking request once there are enough requests in the queue. This will not slow down the tracking request. If disabled, you have to setup a cronjob that executes the "./console queuedtracking:process" console command eg every minute to process the queue.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml index 151e26bdc7..385469b2df 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml @@ -16,6 +16,7 @@ <availableValues /> <description>If enabled, the value will be automatically refreshed depending on the specified interval</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -32,6 +33,7 @@ <availableValues /> <description>Defines how often the value should be updated</description> <inlineHelp>Enter a number which is >= 15</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -51,6 +53,7 @@ </availableValues> <description>Pick your favourite color</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -72,6 +75,7 @@ <availableValues /> <description>If enabled, anonymous usage data will be tracked. For example which pages are viewed and which reports are used most often. For more information contact your system administrator.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 7f6c3671eb..0a3d2da7c7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -21,6 +21,7 @@ </availableValues> <description /> <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <templateFile /> <introduction>Release channel</introduction> <condition /> </row> @@ -39,6 +40,7 @@ </availableValues> <description /> <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <templateFile /> <introduction>Send an email when a plugin update is available</introduction> <condition /> </row> @@ -64,6 +66,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -91,6 +94,7 @@ </availableValues> <description>The value will be only displayed in the following browsers</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -108,6 +112,7 @@ Another line</defaultValue> <availableValues /> <description>This description will be displayed next to the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -123,6 +128,7 @@ Another line</defaultValue> <availableValues /> <description>Password for the 3rd API where we fetch the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -144,6 +150,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, logged in users can opt out in their plugin settings. Anonymous users cannot opt out.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -159,6 +166,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description> <inlineHelp /> + <templateFile /> <introduction>Send anonmyized usage data to the creators of Piwik</introduction> <condition /> </row> @@ -174,6 +182,7 @@ Another line</defaultValue> <availableValues /> <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to this Piwik</introduction> <condition /> </row> @@ -189,6 +198,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -205,6 +215,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to a custom Piwik</introduction> <condition /> </row> @@ -221,6 +232,7 @@ Another line</defaultValue> <availableValues /> <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -236,6 +248,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -258,6 +271,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -274,6 +288,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -290,6 +305,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -306,6 +322,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -322,6 +339,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>In case you are using Redis for caching make sure to use a different database.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -338,6 +356,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Password set on the Redis server, if any. Redis can be instructed to require a password before allowing clients to execute commands.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -353,6 +372,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, all tracking requests will be written into a queue instead of the directly into the database. Requires a Redis server and phpredis PHP extension.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -369,6 +389,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Number of allowed maximum queue workers. Accepts a number between 1 and 16. Best practice is to set the number of CPUs you want to make available for queue processing. Be aware you need to make sure to start the workers manually. We recommend to not use 9-15 workers, rather use 8 or 16 as the queue might not be distributed evenly into different queues. DO NOT USE more than 1 worker if you make use the UserId feature when tracking see https://github.com/piwik/piwik/issues/7691</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -385,6 +406,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Defines how many requests will be picked out of the queue and processed at once. Enter a number which is >= 1.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -400,6 +422,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, we will process all requests within a queue during a normal tracking request once there are enough requests in the queue. This will not slow down the tracking request. If disabled, you have to setup a cronjob that executes the "./console queuedtracking:process" console command eg every minute to process the queue.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml index 151e26bdc7..385469b2df 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml @@ -16,6 +16,7 @@ <availableValues /> <description>If enabled, the value will be automatically refreshed depending on the specified interval</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -32,6 +33,7 @@ <availableValues /> <description>Defines how often the value should be updated</description> <inlineHelp>Enter a number which is >= 15</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -51,6 +53,7 @@ </availableValues> <description>Pick your favourite color</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -72,6 +75,7 @@ <availableValues /> <description>If enabled, anonymous usage data will be tracked. For example which pages are viewed and which reports are used most often. For more information contact your system administrator.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 38078f4bb9..41f56d803a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -257,8 +257,8 @@ products,1,1,100%,0.15s Entry page titles label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation -first page view,2,2,100%,0.14s second visitor/two days later/a new visit,8,0,0%,0.32s +first page view,2,2,100%,0.14s Exit pages label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation @@ -268,16 +268,16 @@ products,1,1,100%,0.15s Exit page titles label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation -first page view,2,2,100%,0.14s Checkout/Purchasing...,8,8,100%,0.45s +first page view,2,2,100%,0.14s Page titles label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation -first page view,2,2,100%,00:00:00,100%,0.14s -Page Name not defined,1,1,0%,00:00:00,0%,0.22s Checkout/Purchasing...,8,8,0%,00:00:00,100%,0.45s second visitor/two days later/a new visit,8,8,0%,00:06:00,0%,0.32s second visitor/two days later/second page view,8,8,0%,00:09:00,0%,0.17s +first page view,2,2,100%,00:00:00,100%,0.14s +Page Name not defined,1,1,0%,00:00:00,0%,0.22s Site Search Keywords No data available @@ -317,9 +317,9 @@ No data available Referrer Type label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Direct Entry,1,1,1,00:00:00,100%,$ 0 Websites,6,22,3.7,00:10:01,33%,$ 0 Campaigns,4,20,5,00:15:01,0%,$ 0 +Direct Entry,1,1,1,00:00:00,100%,$ 0 All Referrers label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 1cd91a523e..d2606623e3 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -4394,35 +4394,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.32s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.14s </td> </tr> </tbody> @@ -4547,35 +4547,35 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.45s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.14s </td> </tr> </tbody> @@ -4618,38 +4618,38 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.14s + 0.45s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Page Name not defined </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:06:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4658,13 +4658,13 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.22s + 0.32s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout/Purchasing... </td> + second visitor/two days later/second page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4672,53 +4672,53 @@ 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:09:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.17s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/a new visit </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:06:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.32s + 0.14s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor/two days later/second page view </td> + Page Name not defined </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:09:00 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4727,7 +4727,7 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.17s + 0.22s </td> </tr> </tbody> @@ -4830,21 +4830,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Direct Entry </td> + Websites </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 22 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 3.7 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:10:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 33% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4853,21 +4853,21 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Websites </td> + Campaigns </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 6 + 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 22 + 20 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.7 + 5 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:01 + 00:15:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 33% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -4876,21 +4876,21 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Campaigns </td> + Direct Entry </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 4 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 20 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 5 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:15:01 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 3e5457c1ff..1865028727 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -30,6 +30,7 @@ <availableValues /> <description /> <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Piwik automatically considers both.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -45,6 +46,7 @@ <availableValues /> <description /> <inlineHelp>When enabled, Piwik will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.<br />The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -64,6 +66,7 @@ </availableValues> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -83,6 +86,7 @@ <availableValues /> <description /> <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Piwik. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -102,6 +106,7 @@ <availableValues /> <description /> <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -121,6 +126,7 @@ <availableValues /> <description /> <inlineHelp>Enter the list of user agents to exclude from being tracked by Piwik.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Piwik.<br />You can use this to exclude some bots from being tracked.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -139,6 +145,7 @@ </availableValues> <description /> <inlineHelp>You can use Piwik to track and report what visitors are searching in your website's internal search engine.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -154,6 +161,7 @@ <availableValues /> <description>Query parameter (Default): q,query,s,search,searchword,k,keyword & Category parameter: </description> <inlineHelp /> + <templateFile /> <introduction /> <condition>1 && sitesearch</condition> </row> @@ -171,6 +179,7 @@ <availableValues /> <description /> <inlineHelp>Enter a comma separated list of all query parameter names containing the site search keyword.</inlineHelp> + <templateFile /> <introduction /> <condition>sitesearch && !use_default_site_search_params</condition> </row> @@ -188,6 +197,7 @@ <availableValues /> <description /> <inlineHelp>(optional)<br /><br />You may enter a comma-separated list of query parameters specifying the search category.</inlineHelp> + <templateFile /> <introduction /> <condition>1 && sitesearch && !use_default_site_search_params</condition> </row> @@ -206,6 +216,7 @@ </availableValues> <description /> <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -229,6 +240,7 @@ <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv Binary files differindex 09cdb8f060..351af550cf 100644 --- a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index fc64578e32..6008a52144 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -21,6 +21,7 @@ </availableValues> <description /> <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <templateFile /> <introduction>Release channel</introduction> <condition /> </row> @@ -39,6 +40,7 @@ </availableValues> <description /> <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <templateFile /> <introduction>Send an email when a plugin update is available</introduction> <condition /> </row> @@ -64,6 +66,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -91,6 +94,7 @@ </availableValues> <description>The value will be only displayed in the following browsers</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -108,6 +112,7 @@ Another line</defaultValue> <availableValues /> <description>This description will be displayed next to the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -123,6 +128,7 @@ Another line</defaultValue> <availableValues /> <description>Password for the 3rd API where we fetch the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -144,6 +150,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, logged in users can opt out in their plugin settings. Anonymous users cannot opt out.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -159,6 +166,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description> <inlineHelp /> + <templateFile /> <introduction>Send anonmyized usage data to the creators of Piwik</introduction> <condition /> </row> @@ -174,6 +182,7 @@ Another line</defaultValue> <availableValues /> <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to this Piwik</introduction> <condition /> </row> @@ -189,6 +198,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -205,6 +215,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to a custom Piwik</introduction> <condition /> </row> @@ -221,6 +232,7 @@ Another line</defaultValue> <availableValues /> <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -236,6 +248,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -258,6 +271,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -274,6 +288,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -290,6 +305,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -306,6 +322,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -322,6 +339,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>In case you are using Redis for caching make sure to use a different database.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -338,6 +356,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Password set on the Redis server, if any. Redis can be instructed to require a password before allowing clients to execute commands.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -353,6 +372,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, all tracking requests will be written into a queue instead of the directly into the database. Requires a Redis server and phpredis PHP extension.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -369,6 +389,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Number of allowed maximum queue workers. Accepts a number between 1 and 16. Best practice is to set the number of CPUs you want to make available for queue processing. Be aware you need to make sure to start the workers manually. We recommend to not use 9-15 workers, rather use 8 or 16 as the queue might not be distributed evenly into different queues. DO NOT USE more than 1 worker if you make use the UserId feature when tracking see https://github.com/piwik/piwik/issues/7691</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -385,6 +406,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Defines how many requests will be picked out of the queue and processed at once. Enter a number which is >= 1.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -400,6 +422,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, we will process all requests within a queue during a normal tracking request once there are enough requests in the queue. This will not slow down the tracking request. If disabled, you have to setup a cronjob that executes the "./console queuedtracking:process" console command eg every minute to process the queue.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml index 151e26bdc7..385469b2df 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml @@ -16,6 +16,7 @@ <availableValues /> <description>If enabled, the value will be automatically refreshed depending on the specified interval</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -32,6 +33,7 @@ <availableValues /> <description>Defines how often the value should be updated</description> <inlineHelp>Enter a number which is >= 15</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -51,6 +53,7 @@ </availableValues> <description>Pick your favourite color</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -72,6 +75,7 @@ <availableValues /> <description>If enabled, anonymous usage data will be tracked. For example which pages are viewed and which reports are used most often. For more information contact your system administrator.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index fc64578e32..6008a52144 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -21,6 +21,7 @@ </availableValues> <description /> <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <templateFile /> <introduction>Release channel</introduction> <condition /> </row> @@ -39,6 +40,7 @@ </availableValues> <description /> <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <templateFile /> <introduction>Send an email when a plugin update is available</introduction> <condition /> </row> @@ -64,6 +66,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -91,6 +94,7 @@ </availableValues> <description>The value will be only displayed in the following browsers</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -108,6 +112,7 @@ Another line</defaultValue> <availableValues /> <description>This description will be displayed next to the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -123,6 +128,7 @@ Another line</defaultValue> <availableValues /> <description>Password for the 3rd API where we fetch the value</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -144,6 +150,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, logged in users can opt out in their plugin settings. Anonymous users cannot opt out.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -159,6 +166,7 @@ Another line</defaultValue> <availableValues /> <description>If enabled, anonymized usage data will be sent to demo-anonymous.piwik.org and the tracked data can be viewed there (the data is public). The collected data is used to improve Piwik. Thank you for making Piwik better!</description> <inlineHelp /> + <templateFile /> <introduction>Send anonmyized usage data to the creators of Piwik</introduction> <condition /> </row> @@ -174,6 +182,7 @@ Another line</defaultValue> <availableValues /> <description>If specified, anonymized usage data will be sent to the specified site in this Piwik.</description> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to this Piwik</introduction> <condition /> </row> @@ -189,6 +198,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -205,6 +215,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction>Send anonymize usage data to a custom Piwik</introduction> <condition /> </row> @@ -221,6 +232,7 @@ Another line</defaultValue> <availableValues /> <description>If a URL and Site Id is specified, usage data will be sent to the custom Piwik instance.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -236,6 +248,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -258,6 +271,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -274,6 +288,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -290,6 +305,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Remote host or unix socket of the Redis server. Max 500 characters are allowed.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -306,6 +322,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Port the Redis server is running on. Value should be between 1 and 65535. Use 0 if you are using unix socket to connect to Redis server.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -322,6 +339,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>In case you are using Redis for caching make sure to use a different database.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -338,6 +356,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Password set on the Redis server, if any. Redis can be instructed to require a password before allowing clients to execute commands.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -353,6 +372,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, all tracking requests will be written into a queue instead of the directly into the database. Requires a Redis server and phpredis PHP extension.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -369,6 +389,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Number of allowed maximum queue workers. Accepts a number between 1 and 16. Best practice is to set the number of CPUs you want to make available for queue processing. Be aware you need to make sure to start the workers manually. We recommend to not use 9-15 workers, rather use 8 or 16 as the queue might not be distributed evenly into different queues. DO NOT USE more than 1 worker if you make use the UserId feature when tracking see https://github.com/piwik/piwik/issues/7691</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -385,6 +406,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>Defines how many requests will be picked out of the queue and processed at once. Enter a number which is >= 1.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -400,6 +422,7 @@ Another line</defaultValue> <availableValues /> <description /> <inlineHelp>If enabled, we will process all requests within a queue during a normal tracking request once there are enough requests in the queue. This will not slow down the tracking request. If disabled, you have to setup a cronjob that executes the "./console queuedtracking:process" console command eg every minute to process the queue.</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml index 151e26bdc7..385469b2df 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml @@ -16,6 +16,7 @@ <availableValues /> <description>If enabled, the value will be automatically refreshed depending on the specified interval</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -32,6 +33,7 @@ <availableValues /> <description>Defines how often the value should be updated</description> <inlineHelp>Enter a number which is >= 15</inlineHelp> + <templateFile /> <introduction /> <condition /> </row> @@ -51,6 +53,7 @@ </availableValues> <description>Pick your favourite color</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> @@ -72,6 +75,7 @@ <availableValues /> <description>If enabled, anonymous usage data will be tracked. For example which pages are viewed and which reports are used most often. For more information contact your system administrator.</description> <inlineHelp /> + <templateFile /> <introduction /> <condition /> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml index d81561ed0d..362e1b5c57 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> + <row> <label>cloudsite5.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> @@ -75,15 +86,4 @@ <url>http://cloudsite7.com/28/download</url> <segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment> </row> - <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml index f773d20db9..b31b3e4ce0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <avg_bandwidth>0</avg_bandwidth> + </row> + <row> <label>othersite10.com/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> @@ -75,15 +86,4 @@ <url>http://othersite12.com/</url> <segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment> </row> - <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <avg_bandwidth>0</avg_bandwidth> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml index c139c3b992..9a3eb80b01 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml @@ -20,29 +20,26 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0</label> - <nb_visits>1</nb_visits> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_hits>1</nb_hits> + <label>title_0/ - Others</label> + <nb_visits>3</nb_visits> + <nb_hits>3</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> - <entry_nb_visits>1</entry_nb_visits> - <entry_nb_actions>1</entry_nb_actions> + <entry_nb_visits>3</entry_nb_visits> + <entry_nb_actions>3</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> - <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> - <exit_nb_visits>1</exit_nb_visits> + <entry_bounce_count>3</entry_bounce_count> + <exit_nb_visits>3</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_1</label> + <label>title_0</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> @@ -64,26 +61,29 @@ <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/ - Others</label> - <nb_visits>3</nb_visits> - <nb_hits>3</nb_hits> + <label>title_0/title_0</label> + <nb_visits>1</nb_visits> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> <sum_bandwidth>0</sum_bandwidth> <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> <min_bandwidth /> <max_bandwidth /> - <entry_nb_visits>3</entry_nb_visits> - <entry_nb_actions>3</entry_nb_actions> + <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_bounce_count>1</entry_bounce_count> + <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors> + <exit_nb_visits>1</exit_nb_visits> <avg_bandwidth>0</avg_bandwidth> <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> </row> <row> - <label>title_0/title_0</label> + <label>title_1</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml index 77c72b8a88..933de9f5f0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml @@ -1,6 +1,25 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_visits>10</nb_visits> + <nb_hits>10</nb_hits> + <sum_time_spent>0</sum_time_spent> + <sum_bandwidth>0</sum_bandwidth> + <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> + <min_bandwidth /> + <max_bandwidth /> + <entry_nb_visits>10</entry_nb_visits> + <entry_nb_actions>10</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>10</entry_bounce_count> + <exit_nb_visits>10</exit_nb_visits> + <avg_bandwidth>0</avg_bandwidth> + <avg_time_on_page>0</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + </row> + <row> <label>0/ - Others</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> @@ -129,23 +148,4 @@ <url>http://piwik.net/2/</url> <segment>pageUrl==http%3A%2F%2Fpiwik.net%2F2%2F</segment> </row> - <row> - <label>Others</label> - <nb_visits>10</nb_visits> - <nb_hits>10</nb_hits> - <sum_time_spent>0</sum_time_spent> - <sum_bandwidth>0</sum_bandwidth> - <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth> - <min_bandwidth /> - <max_bandwidth /> - <entry_nb_visits>10</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>0</entry_sum_visit_length> - <entry_bounce_count>10</entry_bounce_count> - <exit_nb_visits>10</exit_nb_visits> - <avg_bandwidth>0</avg_bandwidth> - <avg_time_on_page>0</avg_time_on_page> - <bounce_rate>100%</bounce_rate> - <exit_rate>100%</exit_rate> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml index 834ce79c36..a496ea54f0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_actions>60</nb_actions> + </row> + <row> <label>name - Others</label> <nb_visits>19</nb_visits> <nb_actions>19</nb_actions> @@ -20,8 +24,4 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> </row> - <row> - <label>Others</label> - <nb_actions>60</nb_actions> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml index 41c9589a79..7bcbbd88ce 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_visits>7</nb_visits> + <nb_actions>7</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>7</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> <label>this search term - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> @@ -51,15 +62,4 @@ <url>http://ask.com/web?q=this+search+term</url> <logo>plugins/Referrers/images/searchEngines/ask.com.png</logo> </row> - <row> - <label>Others</label> - <nb_uniq_visitors>7</nb_uniq_visitors> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml index f5e9832ea3..2f781c0adb 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml @@ -24,14 +24,14 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Search Engines</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Websites</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> + <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> @@ -46,7 +46,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Websites</label> + <label>Search Engines</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -58,13 +58,13 @@ </row> <row> <label>Websites</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <nb_users>0</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml index ab41a14413..17ab7cc1e9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml @@ -1,6 +1,19 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>6</nb_visits> + <nb_actions>6</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>6</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <url>URL unknown!</url> + <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + </row> + <row> <label>Google - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> @@ -50,17 +63,4 @@ <url>http://search.yahoo.com/search?p=search+term+4</url> <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> </row> - <row> - <label>Others</label> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_visits>6</nb_visits> - <nb_actions>6</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> - </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml index de1eda0305..ced727b099 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Others</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> <label>whatever0.com/ - Others</label> <nb_uniq_visitors>2</nb_uniq_visitors> <nb_visits>2</nb_visits> @@ -48,15 +59,4 @@ <nb_visits_converted>0</nb_visits_converted> <url>http://whatever1.com/0</url> </row> - <row> - <label>Others</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> </result>
\ No newline at end of file |