regressify 1.8.3 → 1.8.4

package/.engine_scripts/playwright/loadCookies.js

@@ -3,7 +3,7 @@ const YAML = require('js-yaml');
 const chalkImport = import('chalk').then((m) => m.default);
 
 module.exports = async (browserContext, scenario) => {
-  let cookies = [];
+  let cookiesFromFile = [];
   const cookiePath = scenario.cookiePath;
   const chalk = await chalkImport;
   const logPrefix = chalk.yellow(`[${scenario.index} of ${scenario.total}] `);
@@ -12,12 +12,42 @@ module.exports = async (browserContext, scenario) => {
   if (!!cookiePath && fs.existsSync(cookiePath)) {
     let content = fs.readFileSync(cookiePath);
     if (cookiePath.endsWith('.json')) {
-      cookies = JSON.parse(content);
+      cookiesFromFile = JSON.parse(content);
     } else if (cookiePath.endsWith('.yaml') || cookiePath.endsWith('.yml')) {
-      cookies = YAML.load(content);
+      cookiesFromFile = YAML.load(content);
     }
   }
 
+  const cookies = [];
+
+  // MUNGE COOKIE DOMAIN
+  [].forEach.call(cookiesFromFile, (c) => {
+    let domains = typeof c.domain === 'string' ? [c.domain] : c.domain;
+
+    [].forEach.call(domains, (domain) => {
+      const cookie = { ...c };
+      if (domain.startsWith('http://') || domain.startsWith('https://')) {
+        cookie.url = domain;
+      } else {
+        cookie.url = 'https://' + domain;
+      }
+
+      if (!cookie.expirationDate) {
+        cookie.expirationDate = Date.now() / 1000 + 31536000; // 1 year from now
+      }
+
+      cookie.domain = undefined;
+      delete cookie.domain;
+
+      cookies.push(cookie);
+    });
+  });
+
+  if (process.env.DEBUG_COOKIES === 'true') {
+    console.log('Restoring cookies from:', cookiePath);
+    console.log(JSON.stringify(cookies, null, 2));
+  }
+
   // Add cookies to browser
   await browserContext.addCookies(cookies);
 

package/.engine_scripts/puppet/loadCookies.js

@@ -2,23 +2,23 @@ const fs = require('fs');
 const YAML = require('js-yaml');
 
 module.exports = async (page, scenario) => {
-  let cookies = [];
+  let cookiesFromFile = [];
   const cookiePath = scenario.cookiePath;
 
   // READ COOKIES FROM FILE IF EXISTS
   if (!!cookiePath && fs.existsSync(cookiePath)) {
     let content = fs.readFileSync(cookiePath);
     if (cookiePath.endsWith('.json')) {
-      cookies = JSON.parse(content);
+      cookiesFromFile = JSON.parse(content);
     } else if (cookiePath.endsWith('.yaml') || cookiePath.endsWith('.yml')) {
-      cookies = YAML.load(content);
+      cookiesFromFile = YAML.load(content);
     }
   }
 
-  const parsedCookies = [];
+  const cookies = [];
 
   // MUNGE COOKIE DOMAIN
-  [].forEach.call(cookies, (c) => {
+  [].forEach.call(cookiesFromFile, (c) => {
     let domains = typeof c.domain === 'string' ? [c.domain] : c.domain;
 
     [].forEach.call(domains, (domain) => {
@@ -36,19 +36,19 @@ module.exports = async (page, scenario) => {
       cookie.domain = undefined;
       delete cookie.domain;
 
-      parsedCookies.push(cookie);
+      cookies.push(cookie);
     });
   });
 
   if (process.env.DEBUG_COOKIES === 'true') {
     console.log('Restoring cookies from:', cookiePath);
-    console.log(JSON.stringify(parsedCookies, null, 2));
+    console.log(JSON.stringify(cookies, null, 2));
   }
 
   // SET COOKIES
   const setCookies = async () => {
     return Promise.all(
-      parsedCookies.map(async (cookie) => {
+      cookies.map(async (cookie) => {
         await page.setCookie(cookie);
       })
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "regressify",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "Visual regression tests support",
   "main": "src/index.ts",
   "type": "module",