From 63b8b3c8490b4dd72e27a2aa31a10b3e4a6f8043 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 14 May 2020 12:04:09 -0700 Subject: [PATCH] Revert "Reland "DEV: Add checks that assets do not modify cookies to smoke-test.js" (#9774)" (#9783) This reverts commit 186c471c44a278cfc8f29a18a649ce681ef92ab5. --- test/smoke_test.js | 80 +--------------------------------------------- 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/test/smoke_test.js b/test/smoke_test.js index 728ac91c5f1..abd1a4589b8 100644 --- a/test/smoke_test.js +++ b/test/smoke_test.js @@ -14,15 +14,6 @@ console.log(`Starting Discourse Smoke Test for ${url}`); const puppeteer = require("puppeteer"); const path = require("path"); -async function getCookie(name, page) { - const cookies = await page.cookies(); - let found = null; - cookies.forEach(c => { - if (c.name === name) found = c; - }); - return found; -} - (async () => { const browser = await puppeteer.launch({ // when debugging localy setting the SHOW_BROWSER env variable can be very helpful @@ -79,11 +70,7 @@ async function getCookie(name, page) { page.on("console", msg => console.log(`PAGE LOG: ${msg.text()}`)); page.on("response", resp => { - if ( - resp.status() !== 200 && - resp.status() !== 302 && - resp.status() !== 304 - ) { + if (resp.status() !== 200 && resp.status() !== 302) { console.log( "FAILED HTTP REQUEST TO " + resp.url() + " Status is: " + resp.status() ); @@ -142,49 +129,6 @@ async function getCookie(name, page) { return page.waitForSelector("header .login-button", { visible: true }); }); - // Prep for assets check - const anyStylesheetEl = await page.$('link[href][rel="stylesheet"]'); - const anyAssetPath = await page.evaluate( - el => el.getAttribute("href"), - anyStylesheetEl - ); - if (!anyAssetPath) { - return console.log("FAILED - could not retrieve an asset path"); - } - - function checkNoCookies(testPath) { - return async function() { - const priorCookie = await getCookie("_t", page); - const testURL = new URL(testPath, url); - - await page.setCookie({ - name: "_t", - value: "invalid_auth_token", - url: url, - domain: priorCookie.domain, - path: priorCookie.path, - expires: priorCookie.expires, - httpOnly: priorCookie.httpOnly, - secure: priorCookie.secure, - session: priorCookie.session, - sameSite: priorCookie.sameSite - }); - const badCookie = await getCookie("_t", page); - if (badCookie.value !== "invalid_auth_token") { - throw "FAILED - could not set cookie"; - } - - await page.goto(testURL); - - const newCookie = await getCookie("_t", page); - if (newCookie === null || newCookie.value !== "invalid_auth_token") { - throw "FAILED - Cookie was modified while fetching " + testPath; - } - - await page.setCookie(priorCookie); - }; - } - if (process.env.LOGIN_AT_BEGINNING) { await login(); } @@ -238,28 +182,6 @@ async function getCookie(name, page) { return promise; }); - await exec( - `assets do not set cookies (${anyAssetPath})`, - checkNoCookies(anyAssetPath || "/assets/stylesheets/bogus.css") - ); - await exec( - "service-worker.js does not set cookies", - checkNoCookies("/service-worker.js") - ); - await exec("application paths do clear invalid cookies", async () => { - const fn = checkNoCookies("/about"); - let failure = false; - try { - await fn(); - failure = true; - } catch (e) { - // Expecting cookies to be set, so a throw is correct - } - if (failure) { - throw "FAILED - cookies not fixed on an application path"; - } - }); - await exec("it shows a topic list", () => { return page.waitForSelector(".topic-list", { visible: true }); });