Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/PHPUnit/Framework/TestRequest/Response.php3
-rw-r--r--tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php12
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html18
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html18
-rw-r--r--tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png4
-rw-r--r--tests/UI/expected-screenshots/CoreUpdaterDb_updated.png4
-rw-r--r--tests/UI/expected-screenshots/DashboardManager_create_new.png4
-rw-r--r--tests/UI/expected-screenshots/DashboardManager_removed.png4
-rw-r--r--tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png4
-rw-r--r--tests/UI/expected-screenshots/Dashboard_removed.png4
-rw-r--r--tests/UI/expected-screenshots/Dashboard_reset.png4
-rw-r--r--tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png4
-rw-r--r--tests/UI/expected-screenshots/Installation_js_tracking.png4
-rw-r--r--tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png4
-rw-r--r--tests/UI/expected-screenshots/Theme_home.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png4
-rw-r--r--tests/javascript/index.php18
22 files changed, 76 insertions, 59 deletions
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php
index 5969725de7..56d4c7080d 100644
--- a/tests/PHPUnit/Framework/TestRequest/Response.php
+++ b/tests/PHPUnit/Framework/TestRequest/Response.php
@@ -253,6 +253,9 @@ class Response
$response = str_replace('.000000</l', '</l', $response); //lat/long
$response = str_replace('.00</revenue>', '</revenue>', $response);
+ // eg. <totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+ $response = str_replace('.00</t', '</t', $response);
+
return $response;
}
diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
index f4eb5d799b..30ddbd7cd6 100644
--- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
+++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -39,7 +39,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = "&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
_paq.push([\"setCookieDomain\", \"*.localhost\"]);
_paq.push([\"setDomains\", [\"*.localhost/piwik\",\"*.another-domain/piwik\",\"*.another-domain/piwik\"]]);
@@ -78,7 +78,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = "&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
@@ -116,7 +116,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = "&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
// you can set up to 5 custom variables for each visitor
_paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]);
@@ -163,7 +163,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = "&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
// you can set up to 5 custom variables for each visitor
_paq.push([\"setCustomVariable\", 1, \"name\", \"value\", \"visit\"]);
@@ -207,7 +207,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = "&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push([\"setDocumentTitle\", document.domain + \"/\" + document.title]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
@@ -244,7 +244,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase
$expected = '&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
// you can set up to 5 custom variables for each visitor
_paq.push(["setCustomVariable", 1, "abc\"def", "abc\"def", "visit"]);
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 cdbadbaa2a..fe63fbe641 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
@@ -15,8 +15,8 @@
<tr>
<td>
<a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px">
- <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
- </a>
+ <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
+ </a>
</td>
<td align="right">
<a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Site 1." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests">
@@ -5343,14 +5343,14 @@
There is no data for this report.
-<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
+ <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
-<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &quot;Segoe UI&quot;, Roboto, Oxygen-Sans, Cantarell, &quot;Helvetica Neue&quot;, sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
- Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
- <br />
- The leading open analytics platform that respects your privacy.
-</p>
+ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &quot;Segoe UI&quot;, Roboto, Oxygen-Sans, Cantarell, &quot;Helvetica Neue&quot;, sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
+ Powered by
+ <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <br />
+ The leading open analytics platform that respects your privacy.
+ </p>
</div>
</body>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
index d8a851d3c8..6c8629bcf7 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml
@@ -2,7 +2,7 @@
<result>&lt;!-- Piwik --&gt;
&lt;script type=&quot;text/javascript&quot;&gt;
var _paq = _paq || [];
- // tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot;
+ /* tracker methods like &quot;setCustomDimension&quot; should be called before &quot;trackPageView&quot; */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 66ae5338cf..a068adcd4d 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -15,8 +15,8 @@
<tr>
<td>
<a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/" style="lineheight:17px">
- <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
- </a>
+ <img src="http://example.com/piwik/tests/PHPUnit/proxy//plugins/Morpheus/images/logo-email.png" height="20px" width="auto" alt="Piwik, free/libre analytics platform" />
+ </a>
</td>
<td align="right">
<a style="font-size:16px; padding:0 15px; color:#ffffff" title="View Web Analytics reports for Piwik test." target="_blank" href="http://example.com/piwik/tests/PHPUnit/proxy/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today-date-removed-in-tests">
@@ -6746,14 +6746,14 @@
There is no data for this report.
-<hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
+ <hr style=" border: 0; margin-top: 50px; height: 1px; background-image: linear-gradient(to right, rgba(231, 231, 231, 0), rgba(231, 231, 231, 1), rgba(2311, 2311, 231, 0));">
-<p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &quot;Segoe UI&quot;, Roboto, Oxygen-Sans, Cantarell, &quot;Helvetica Neue&quot;, sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
- Powered by
- <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
- <br />
- The leading open analytics platform that respects your privacy.
-</p>
+ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &quot;Segoe UI&quot;, Roboto, Oxygen-Sans, Cantarell, &quot;Helvetica Neue&quot;, sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'>
+ Powered by
+ <a style="color:#439fe0; " href="https://piwik.org/" title="Piwik Analytics">Piwik Analytics</a>
+ <br />
+ The leading open analytics platform that respects your privacy.
+ </p>
</div>
</body>
diff --git a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png
index b0b110eee9..c8bcd22ae5 100644
--- a/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png
+++ b/tests/UI/expected-screenshots/CoreUpdaterCode_newVersion.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d94a49eeccd387323a6e4c2d275099d56893275145c006e844b4298cf42751ad
-size 105759
+oid sha256:c8bb4b50b39944cd1c0cf8b5a282c8ec4ec8223d4e760ee79c333225bfb1ca04
+size 106399
diff --git a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
index 14563d3887..b855411727 100644
--- a/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
+++ b/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f6b54dcae7049ed937d01a19238fc62d33adf863f945b27c768c0c4f82548c16
-size 74391
+oid sha256:03c097db06daa76df4c9bc9eab062b3830c49364898467ff0d5c3db920efef28
+size 76446
diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png
index c59b7b16be..ae1c1a9ab4 100644
--- a/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:37fa2337c1ac3407431a002ff62595cc2720fa16fa6b26027677fcc0c10dd918
-size 244955
+oid sha256:763a130436a69516580ba5f0c903715d3e4a433fbc8983da1b555bdb0368453f
+size 246428
diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png
index 03ecd49885..2b980169e6 100644
--- a/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c868db3c1ab399cde8d451bbfa93877c6344b79919a85ecb17359355f756f737
-size 366062
+oid sha256:613f57b24112efa26462817b198362f007ce57ad323178295c4093971da78359
+size 366770
diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index cdcd8f823a..c8ef73bf04 100644
--- a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:28a153ddf467e2d9809e2e0847ba84ecaf2237ebe4cd30d3d20af83abed5cf7a
-size 536038
+oid sha256:12df3f544d1bacb0ee0a34b4cc8e8eabbfe3da8c6cae8b3e59dd2ee49d3e464b
+size 537961
diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png
index 6a9f9afe36..961419dfee 100644
--- a/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9d3263337b7290ee7245de98f6e9536d3bc27a2bfa19f00f1b62a3f2b962027d
-size 535736
+oid sha256:1a841e2177f533da08b2382fabc3f91e6c54af227604f3d69a67ed79426785dc
+size 537637
diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png
index dcfa72ad40..378d541743 100644
--- a/tests/UI/expected-screenshots/Dashboard_reset.png
+++ b/tests/UI/expected-screenshots/Dashboard_reset.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6be595803eb63fa3a0bb53355d3d62b91b4ec02dcf011d44c8ebca6cf35ccd38
-size 248766
+oid sha256:3708f066bc45dca4fe1f58454cea6c48abfd32a078ee94dd5b8a674c1bb7bdc9
+size 250604
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
index e11b4e6329..0ec9b44b84 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e73789714f952abb0d5e1673ff6340eeb0563b07284b7646436802b3109d62a9
-size 178794
+oid sha256:ce3bd400dcd3586fe1874141e386997bc4d3983f73a94beb58e2e43fb76ffbed
+size 178968
diff --git a/tests/UI/expected-screenshots/Installation_js_tracking.png b/tests/UI/expected-screenshots/Installation_js_tracking.png
index f9141294b2..f763bd2c8a 100644
--- a/tests/UI/expected-screenshots/Installation_js_tracking.png
+++ b/tests/UI/expected-screenshots/Installation_js_tracking.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e4e8e866011ff143a95da23a4366e1306b20eb3670b29f59db2880b2798452ea
-size 192744
+oid sha256:3fcce42eb580e158fd1eac73e2146360a33594e65f5d925e561698b07f38dc3d
+size 192902
diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
index 7f27f96eed..fa3726eeba 100644
--- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
+++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:743b8d4260a5f7759ef5965a4313f7e4224035bb7a186c2db3ecad6876d8aabf
-size 429673
+oid sha256:f5374f56887499ba2aca22f50d02096d7e0fcd6252a90563408ed2512fef077e
+size 424564
diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png
index 564acb4490..17793e92d2 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:ee0d04bc0231261ea1b390bf40d17daf9429f3a017728487207ffc8470eaebda
-size 535185
+oid sha256:21869e1be4501adf9e9e8d63a7c550d29f1860daa5e1149c312c84f5f078db83
+size 536690
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 5603c2c72c..b4569d0fe7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5f14b4466225d8a92c009f613f111d3c098792d0e07f9c9be3141e86e7eafd23
-size 3519243
+oid sha256:a90487bbaaae92569b8ddc2c3fa0ffd19b973ae7cd771efdea6b11199efdd7b5
+size 3532421
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png
index a151fb3ca1..db62d73aac 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:13c4d8d62f227c97b1861f178e643e0c68b37a96b917efbbf8e55b2014d5e4a7
-size 124829
+oid sha256:b3d266b43692d54103aef43324162c7bad12c77e4294f5a1f6c7080aa4f9c4b5
+size 126685
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
index c24b54671b..93374c50e5 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9cb4ac6babbc2143080ab724617639d8fbfa4d10b789072be0be65f1170a5a34
-size 301267
+oid sha256:53c71ad2658c4aee22a1e7b376c11cdc9436f05cb8e30f0b1e7ee4f6628e5045
+size 301435
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
index 6f056bd58e..018d3b2cbd 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9205eaf8408b1c05663745b4d891f57d64fc848ae2a8e94b79fd0f1f559e38ad
-size 483981
+oid sha256:8e9b3edd05bed09a4f0411f052cae8759fdf44a83db8f98bc19313f6f70c22fa
+size 487730
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png
index 2d7e97ef09..21e8f2e424 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5636ae6b17f8bd1e399802071537ee8bfc0558700094f84b2eb4b7ecc1c2e14b
-size 491277
+oid sha256:a47b2faafccaae769f3814adf4a23a99d7fe04ec563b5a4ae736a963bae42980
+size 493755
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index 09480cafae..4e2e5ab0fc 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -610,7 +610,7 @@ function PiwikTest() {
});
test("Piwik plugin methods", function() {
- expect(31);
+ expect(33);
// TESTS FOR retryMissedPluginCalls
@@ -703,6 +703,8 @@ function PiwikTest() {
strictEqual('function', typeof Piwik.DOM.onReady, "DOM.onReady method is defined");
strictEqual('function', typeof Piwik.DOM.onLoad, "DOM.onLoad method is defined");
strictEqual('function', typeof Piwik.DOM.addEventListener, "DOM.addEventListener method is defined");
+ strictEqual('function', typeof Piwik.DOM.isNodeVisible, "DOM.isNodeVisible method is defined");
+ strictEqual('function', typeof Piwik.DOM.isOrWasNodeVisible, "DOM.isOrWasNodeVisible method is defined");
Piwik.DOM.onLoad(function () {
loaded = true;
@@ -2102,7 +2104,7 @@ function PiwikTest() {
});
test("API methods", function() {
- expect(75);
+ expect(76);
equal( typeof Piwik.addPlugin, 'function', 'addPlugin' );
equal( typeof Piwik.addPlugin, 'function', 'addTracker' );
@@ -2139,6 +2141,7 @@ function PiwikTest() {
equal( typeof tracker.getCustomVariable, 'function', 'getCustomVariable' );
equal( typeof tracker.deleteCustomVariable, 'function', 'deleteCustomVariable' );
equal( typeof tracker.setLinkTrackingTimer, 'function', 'setLinkTrackingTimer' );
+ equal( typeof tracker.getLinkTrackingTimer, 'function', 'getLinkTrackingTimer' );
equal( typeof tracker.setDownloadExtensions, 'function', 'setDownloadExtensions' );
equal( typeof tracker.addDownloadExtensions, 'function', 'addDownloadExtensions' );
equal( typeof tracker.removeDownloadExtensions, 'function', 'removeDownloadExtensions' );
@@ -2977,6 +2980,17 @@ function PiwikTest() {
});
+ test("Tracker getLinkTrackingTimer() setLinkTrackingTimer", function() {
+ expect(2);
+
+ var tracker = Piwik.getTracker();
+
+ equal(500, tracker.getLinkTrackingTimer(), 'getLinkTrackingTimer, default is 500');
+ tracker.setLinkTrackingTimer(1091);
+ equal(1091, tracker.getLinkTrackingTimer(), 'setLinkTrackingTimer, changed value');
+ tracker.setLinkTrackingTimer(500);
+ });
+
test("Tracker setDownloadExtensions(), addDownloadExtensions(), setDownloadClasses(), setLinkClasses(), and getLinkType()", function() {
expect(72);