libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

tests: Always set cookie path to / (to match non-test behavior)

Browse source
This commit is contained in:
Richard Hansen 2021-03-31 04:40:42 -04:00 committed by webzwo0i
parent 5666c34061
commit 137fa89d2a
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/tests/frontend/helper.js
View file

@ -59,19 +59,14 @@ const helper = {};
// Can only happen when the iframe exists, so we're doing it separately from other cookies // Can only happen when the iframe exists, so we're doing it separately from other cookies
helper.clearPadPrefCookie = () => { helper.clearPadPrefCookie = () => {
helper.padChrome$.document.cookie = 'prefsHttp=;expires=Thu, 01 Jan 1970 00:00:00 GMT'; helper.padChrome$.document.cookie = 'prefsHttp=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/';
}; };
// Overwrite all prefs in pad cookie. Assumes http, not https. // Overwrite all prefs in pad cookie. Assumes http, not https.
//
// `helper.padChrome$.document.cookie` (the iframe) and `window.document.cookie`
// seem to have independent cookies, UNLESS we put path=/ here (which we don't).
// I don't fully understand it, but this function seems to properly simulate
// padCookie.setPref in the client code
helper.setPadPrefCookie = (prefs) => { helper.setPadPrefCookie = (prefs) => {
const val = encodeURIComponent(JSON.stringify(prefs)); const val = encodeURIComponent(JSON.stringify(prefs));
helper.padChrome$.document.cookie = helper.padChrome$.document.cookie =
`prefsHttp=${val};expires=Thu, 01 Jan 3000 00:00:00 GMT`; `prefsHttp=${val};expires=Thu, 01 Jan 3000 00:00:00 GMT; path=/`;
}; };
// Functionality for knowing what key event type is required for tests // Functionality for knowing what key event type is required for tests

8
src/tests/frontend/specs/helper.js
View file

@ -76,14 +76,9 @@ describe('the test helper', function () {
// Now that we have a chrome, we can set a pad cookie // Now that we have a chrome, we can set a pad cookie
// so we can confirm it gets wiped as well // so we can confirm it gets wiped as well
chrome$.document.cookie = 'prefsHtml=baz;expires=Thu, 01 Jan 3030 00:00:00 GMT'; chrome$.document.cookie = 'prefsHtml=baz;expires=Thu, 01 Jan 3030 00:00:00 GMT; path=/';
expect(chrome$.document.cookie).to.contain('prefsHtml=baz'); expect(chrome$.document.cookie).to.contain('prefsHtml=baz');
// Cookies are weird. Because it's attached to chrome$ (as helper.setPadCookies does)
// AND we didn't put path=/, we shouldn't expect it to be visible on
// window.document.cookie. Let's just be sure.
expect(window.document.cookie).to.not.contain('prefsHtml=baz');
// give it a second to save the username on the server side // give it a second to save the username on the server side
await new Promise((resolve) => setTimeout(resolve, 1000)); await new Promise((resolve) => setTimeout(resolve, 1000));
@ -96,7 +91,6 @@ describe('the test helper', function () {
expect(window.document.cookie).to.not.contain('token=foo'); expect(window.document.cookie).to.not.contain('token=foo');
expect(window.document.cookie).to.not.contain('language=bar'); expect(window.document.cookie).to.not.contain('language=bar');
expect(chrome$.document.cookie).to.contain('prefsHtml=baz'); expect(chrome$.document.cookie).to.contain('prefsHtml=baz');
expect(window.document.cookie).to.not.contain('prefsHtml=baz');
expect(window.document.cookie).to.not.be(firstCookie); expect(window.document.cookie).to.not.be(firstCookie);

2
src/tests/frontend/specs/language.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
const deletecookie = (name) => { const deletecookie = (name) => {
document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:01 GMT;`; document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/`;
}; };
describe('Language select and change', function () { describe('Language select and change', function () {