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:
authorMatthieu Aubry <mattab@users.noreply.github.com>2017-12-15 00:00:16 +0300
committerGitHub <noreply@github.com>2017-12-15 00:00:16 +0300
commit73fa23c8e6478e2b378fb6d255f042484486673f (patch)
treee697aa8ad17e7b0386c39145adeae449990b8b68 /tests
parentc4a4444a56cffcaee9ec86435165c1bfb4f673f8 (diff)
JS Tracker: make setSecureCookie work (#12355)
* JS Tracker: make setSecureCookie work * update test
Diffstat (limited to 'tests')
-rw-r--r--tests/javascript/index.php12
-rw-r--r--tests/javascript/piwiktest.js4
2 files changed, 3 insertions, 13 deletions
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index d2c1b36e3e..a07967a5f9 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -2104,7 +2104,7 @@ function PiwikTest() {
});
test("API methods", function() {
- expect(88);
+ expect(89);
equal( typeof Piwik.addPlugin, 'function', 'addPlugin' );
equal( typeof Piwik.addPlugin, 'function', 'addTracker' );
@@ -2168,6 +2168,7 @@ function PiwikTest() {
equal( typeof tracker.setCookieDomain, 'function', 'setCookieDomain' );
equal( typeof tracker.setCookiePath, 'function', 'setCookiePath' );
equal( typeof tracker.setSessionCookie, 'function', 'setSessionCookie' );
+ equal( typeof tracker.setSecureCookie, 'function', 'setSecureCookie' );
equal( typeof tracker.getCookie, 'function', 'getCookie' );
equal( typeof tracker.hasCookies, 'function', 'hasCookies' );
equal( typeof tracker.getCookiePath, 'function', 'getCookiePath' );
@@ -2983,15 +2984,6 @@ function PiwikTest() {
equal( tracker.hook.test._getCookie( cookieName ), expectedValue, 'getCookie(), setCookie()' );
});
- test("Tracker setSecureCookie(), isSecureCookie()", function() {
- expect(1);
-
- var tracker = Piwik.getTracker();
-
- tracker.hook.test._setSecureCookie(1);
- equal( tracker.hook.test._isSecureCookie(), 1);
- });
-
test("Tracker getCookieName() contains website ID", function() {
expect(4);
diff --git a/tests/javascript/piwiktest.js b/tests/javascript/piwiktest.js
index 0909f31dba..514d1c5c8c 100644
--- a/tests/javascript/piwiktest.js
+++ b/tests/javascript/piwiktest.js
@@ -26,9 +26,7 @@ Piwik.addPlugin('testPlugin', {
'_getCookie : getCookie,' +
'_getCookieName : getCookieName,' +
'_setCookie : setCookie,' +
- '_setSecureCookie : setSecureCookie,' +
- '_isSecureCookie : isSecureCookie,' +
- '_getLinkIfShouldBeProcessed : getLinkIfShouldBeProcessed,' +
+ '_getLinkIfShouldBeProcessed : getLinkIfShouldBeProcessed,' +
'_encode : encodeWrapper,' +
'_decode : decodeWrapper,' +
'_urldecode : urldecode,' +