diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-11-29 10:22:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-29 10:22:15 +0300 |
commit | 73010596f01b9660899267305fe0cf5064428753 (patch) | |
tree | 367851f6c476d10f51c0a2a8756f02d260583d83 /tests/resources | |
parent | 970883b106229f11a071c5470538bfb29dc83871 (diff) |
Make matomo.js and matomo.php the default Tracking API endpoints used (#13596)
* Make matomo.js and matomo.php the default Tracking API endpoints used
* few fixes
* fix few tests
* update matomo php tracker in composer
* make sure to record install version
* do not overwrite ever install version
* trying to fix test
* more tweaks and fix tests
* prefer matomo endpoint in the ui, fix some tests
* file was still needed
* apply review feedback
* fix ui tests
Diffstat (limited to 'tests/resources')
-rw-r--r-- | tests/resources/overlay-test-site/index.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-1.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-2.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-3.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-4.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-5.html | 4 | ||||
-rw-r--r-- | tests/resources/overlay-test-site/page-6.html | 4 | ||||
-rw-r--r-- | tests/resources/test-download-outlink-page.txt | 10 |
8 files changed, 19 insertions, 19 deletions
diff --git a/tests/resources/overlay-test-site/index.html b/tests/resources/overlay-test-site/index.html index 9d2673a425..2b1f099263 100644 --- a/tests/resources/overlay-test-site/index.html +++ b/tests/resources/overlay-test-site/index.html @@ -81,12 +81,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-1.html b/tests/resources/overlay-test-site/page-1.html index 47ef313d3a..16330c63a8 100644 --- a/tests/resources/overlay-test-site/page-1.html +++ b/tests/resources/overlay-test-site/page-1.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-2.html b/tests/resources/overlay-test-site/page-2.html index b2671380f4..43f08ee61f 100644 --- a/tests/resources/overlay-test-site/page-2.html +++ b/tests/resources/overlay-test-site/page-2.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-3.html b/tests/resources/overlay-test-site/page-3.html index 361b3afece..a53f07050e 100644 --- a/tests/resources/overlay-test-site/page-3.html +++ b/tests/resources/overlay-test-site/page-3.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-4.html b/tests/resources/overlay-test-site/page-4.html index 72c5f7aee7..8341fc48c7 100644 --- a/tests/resources/overlay-test-site/page-4.html +++ b/tests/resources/overlay-test-site/page-4.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-5.html b/tests/resources/overlay-test-site/page-5.html index 5b9ac655ed..e8806b0d68 100644 --- a/tests/resources/overlay-test-site/page-5.html +++ b/tests/resources/overlay-test-site/page-5.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/overlay-test-site/page-6.html b/tests/resources/overlay-test-site/page-6.html index ed2c35dd76..1dbe72c1a8 100644 --- a/tests/resources/overlay-test-site/page-6.html +++ b/tests/resources/overlay-test-site/page-6.html @@ -78,12 +78,12 @@ <script type="text/javascript"> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + document.write(unescape("%3Cscript src='" + pkBaseURL + "matomo.js' type='text/javascript'%3E%3C/script%3E")); </script> <script> var pkBaseURL = (("https:" == document.location.protocol) ? "https://%trackerBaseUrl%" : "http://%trackerBaseUrl%"); try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3); + var piwikTracker = Piwik.getTracker(pkBaseURL + "matomo.php", 3); piwikTracker.setCookieDomain('*.piwik.org'); piwikTracker.trackPageView(); diff --git a/tests/resources/test-download-outlink-page.txt b/tests/resources/test-download-outlink-page.txt index 4ad8d83200..fc7ee23c61 100644 --- a/tests/resources/test-download-outlink-page.txt +++ b/tests/resources/test-download-outlink-page.txt @@ -1,8 +1,8 @@ downloads -piwik.php?idsite=1&download=http%3A//forum.piwik.org/mma mai ****/test.zip&rand=0.10591157392713457&redirect=0&name=my outlink name -piwik.php?idsite=1&download=http%3A//forum.piwik.org/test.zip&rand=0.10591157392713457&redirect=0 +matomo.php?idsite=1&download=http%3A//forum.piwik.org/mma mai ****/test.zip&rand=0.10591157392713457&redirect=0&name=my outlink name +matomo.php?idsite=1&download=http%3A//forum.piwik.org/test.zip&rand=0.10591157392713457&redirect=0 outlinks -piwik.php?idsite=1&link=http%3A//www.example.org2/subcategory/subpage/&rand=0.10591157392713457&redirect=0 -piwik.php?idsite=1&link=http%3A//example.org/subcategory/latest.zip/test/&rand=0.10591157392713457&redirect=0 -piwik.php?idsite=1&link=mailto%3Atest@test.com&rand=0.15968200434074042&redirect=0 +matomo.php?idsite=1&link=http%3A//www.example.org2/subcategory/subpage/&rand=0.10591157392713457&redirect=0 +matomo.php?idsite=1&link=http%3A//example.org/subcategory/latest.zip/test/&rand=0.10591157392713457&redirect=0 +matomo.php?idsite=1&link=mailto%3Atest@test.com&rand=0.15968200434074042&redirect=0 |