diff options
Diffstat (limited to 'tests')
9 files changed, 269 insertions, 16 deletions
diff --git a/tests/PHPUnit/Integration/JsProxyTest.php b/tests/PHPUnit/Integration/JsProxyTest.php index 0fbab1890f..17e2430401 100644 --- a/tests/PHPUnit/Integration/JsProxyTest.php +++ b/tests/PHPUnit/Integration/JsProxyTest.php @@ -14,8 +14,14 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group Core */ -class JsProxyTest extends \PHPUnit_Framework_TestCase +class JsProxyTest extends IntegrationTestCase { + public function setUp() + { + parent::setUp(); + Fixture::createWebsite('2014-01-01 02:03:04'); + } + public function testPiwikJs() { $curlHandle = curl_init(); @@ -60,7 +66,7 @@ class JsProxyTest extends \PHPUnit_Framework_TestCase $responseInfo = curl_getinfo($curlHandle); curl_close($curlHandle); - $this->assertEquals(200, $responseInfo["http_code"], var_export($responseInfo, true)); + $this->assertEquals(200, $responseInfo["http_code"], var_export($responseInfo, true) . $fullResponse); $expected = "R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="; $processed = base64_encode($fullResponse); if ($expected != $processed) { diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index b7081fb4fa..ad6e2349cf 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -247,4 +247,251 @@ https://www.example.org/</placeholder> </row> </settings> </row> + <row> + <id>intranet</id> + <name>Intranet Website</name> + <description>An intranet measurable is just like a website but hosted on an internal network.</description> + <howToSetupUrl>?module=CoreAdminHome&action=trackingCodeGenerator</howToSetupUrl> + <settings> + <row> + <pluginName>IntranetMeasurable</pluginName> + <title>IntranetMeasurable</title> + <settings> + <row> + <name>urls</name> + <title>URLs</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>textarea</uiControl> + <uiControlAttributes> + <cols>25</cols> + <rows>3</rows> + <placeholder>http://example.com/ +https://www.example.org/</placeholder> + </uiControlAttributes> + <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 Matomo automatically considers both.</inlineHelp> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>exclude_unknown_urls</name> + <title>Only track visits and actions when the action URL starts with one of the above URLs.</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>When enabled, Matomo 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> + <row> + <name>keep_url_fragment</name> + <title>Keep Page URL fragments when tracking Page URLs</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>string</type> + <uiControl>select</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row>No (Default)</row> + <row>Yes</row> + <row>No</row> + </availableValues> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>excluded_ips</name> + <title>Excluded IPs</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>textarea</uiControl> + <uiControlAttributes> + <cols>20</cols> + <rows>4</rows> + <placeholder>127.0.0.1</placeholder> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. 1.2.3.4/24 or 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> + <row> + <name>excluded_parameters</name> + <title>Excluded Parameters</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>textarea</uiControl> + <uiControlAttributes> + <cols>20</cols> + <rows>4</rows> + </uiControlAttributes> + <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 />Matomo will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>excluded_user_agents</name> + <title>Excluded User Agents</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>textarea</uiControl> + <uiControlAttributes> + <cols>20</cols> + <rows>4</rows> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>Enter the list of user agents to exclude from being tracked by Matomo.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.<br />You can use this to exclude some bots from being tracked.</inlineHelp> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>sitesearch</name> + <title>Site Search</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>integer</type> + <uiControl>select</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row key="1">Site Search tracking enabled</row> + <row key="0">Do not track Site Search</row> + </availableValues> + <description /> + <inlineHelp>You can use Matomo to track and report what visitors are searching in your website's internal search engine.</inlineHelp> + <templateFile /> + <introduction /> + <condition /> + </row> + <row> + <name>use_default_site_search_params</name> + <title>Use <a href='#globalSettings'>default</a> Site Search parameters</title> + <value>1</value> + <defaultValue>1</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description>Query parameter (Default): q,query,s,search,searchword,k,keyword & Category parameter: </description> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition>1 && sitesearch</condition> + </row> + <row> + <name>sitesearch_keyword_parameters</name> + <title>Query parameter</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>text</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <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> + <row> + <name>sitesearch_category_parameters</name> + <title>Category parameter</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>text</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <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> + <row> + <name>ecommerce</name> + <title>Ecommerce</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>integer</type> + <uiControl>select</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row>Not an Ecommerce site</row> + <row>Ecommerce enabled</row> + </availableValues> + <description /> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <templateFile /> + <introduction /> + <condition /> + </row> + </settings> + </row> + <row> + <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> + <settings> + <row> + <name>contact_email</name> + <title>Contact email addresses</title> + <value> + </value> + <defaultValue> + </defaultValue> + <type>array</type> + <uiControl>textarea</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp /> + <templateFile /> + <introduction /> + <condition /> + </row> + </settings> + </row> + </settings> + </row> </result>
\ No newline at end of file diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png index 3761193d1e..11261dad38 100644 --- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png +++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard_ignored.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d24417efabdca2b4a901bbc2c703337f2500a32dcd5bfba7e6bb2e7412b16299 -size 325025 +oid sha256:70da4ac81c11a90e327bbf0b0d38ccb49ed269d41bed7d1ee606dcd20a839bd8 +size 325057 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png index ce9bdb0c35..b65f9cf96b 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:483ab9e85e123dd7d7cdf0809a51121148252678873f4d6dae9a2a5c898db849 -size 168312 +oid sha256:3fbe9f8c726534f3b773de59d4e4351604ffbca32f09b0a3b877f5f1221a9e3d +size 169761 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 2bbf3dfb02..9ab7d06b80 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9734226645c012f582c7e6a2f07b6b5e19961d9e926d85584a3171e27bf3d3de -size 623145 +oid sha256:b31aa38b49ac5040101692650b3a59accca120bbeffe0f62e7ee3a535f641d4e +size 623030 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index eafcaf107f..d8cf7c8af5 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7ee7481d0ac6c14b4aa1d22fc94a53af2c7bbedfb84b7ffc7a14add5d86f26e -size 135666 +oid sha256:82c9c088dc5578e0e6b1417f32b81a5363b5de800d64559708de28fc0967a558 +size 135714 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png index cb408b67c9..b6813487fa 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71a95bc4c1b9f79954c084d8d42d5dcfc3283e3e9adc0f3637e92f730d4e3685 -size 197962 +oid sha256:1bb172a2a2dc74fa8350f4908a5a1caefd1a9e0f8de81e04f1d4d7ebad8797d3 +size 212071 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 71cc492140..1f39286ad7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eed1b04841b1aeb985d5de66ac36527fc0209da9d11b3403dca30b5c11be02c -size 1028028 +oid sha256:77a4889ff5351564c0c75c72527c7c6329af0406b8ec2df33366c7255a44b01e +size 1038888 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index ff0100ba35..83497d4ee7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce3e381230d857d7928d8e13e3c2e712375ad615471d534374be314ca458186f -size 1027505 +oid sha256:630f78ed4c4595afe97d851695480de199a438fcfe21bafe9881dd3dc4cce426 +size 1039115 |
