codeceptjs 2.4.3 → 2.6.2

package/lib/helper/Protractor.js

@@ -1054,8 +1054,7 @@ class Protractor extends Helper {
   }
 
   /**
-   * Checks that the active JavaScript popup, as created by `window.alert|window.confirm|window.prompt`, contains the
-   * given string.
+   * {{> seeInPopup }}
    */
   async seeInPopup(text) {
     const popupAlert = await this.browser.switchTo().alert();

package/lib/helper/Puppeteer.js

@@ -36,7 +36,6 @@ const findReact = require('./extras/React');
 
 let puppeteer;
 let perfTiming;
-let isAuthenticated = false;
 const popupStore = new Popup();
 const consoleLogStore = new Console();
 
@@ -168,11 +167,14 @@ class Puppeteer extends Helper {
   constructor(config) {
     super(config);
 
-    puppeteer = requireg(config.browser === 'firefox' ? 'puppeteer-firefox' : 'puppeteer');
+    puppeteer = requireg('puppeteer');
 
     // set defaults
     this.isRemoteBrowser = false;
     this.isRunning = false;
+    this.isAuthenticated = false;
+    this.sessionPages = {};
+    this.activeSessionName = '';
 
     // override defaults with config
     this._setConfig(config);
@@ -201,7 +203,7 @@ class Puppeteer extends Helper {
   }
 
   _getOptions(config) {
-    return config.browser === 'firefox' ? this.options.firefox : this.options.chrome;
+    return config.browser === 'firefox' ? Object.assign(this.options.firefox, { product: 'firefox' }) : this.options.chrome;
   }
 
   _setConfig(config) {
@@ -220,6 +222,9 @@ class Puppeteer extends Helper {
       {
         name: 'show', message: 'Show browser window', default: true, type: 'confirm',
       },
+      {
+        name: 'windowSize', message: 'Browser viewport size', default: '1200x900',
+      },
     ];
   }
 
@@ -227,7 +232,7 @@ class Puppeteer extends Helper {
     try {
       requireg('puppeteer');
     } catch (e) {
-      return ['puppeteer@^1.6.0'];
+      return ['puppeteer@^3.0.1'];
     }
   }
 
@@ -243,6 +248,7 @@ class Puppeteer extends Helper {
 
 
   async _before() {
+    this.sessionPages = {};
     recorder.retry({
       retries: 5,
       when: err => err.message.indexOf('context') > -1, // ignore context errors
@@ -257,7 +263,8 @@ class Puppeteer extends Helper {
 
     // close other sessions
     const contexts = this.browser.browserContexts();
-    contexts.shift();
+    const defaultCtx = contexts.shift();
+
     await Promise.all(contexts.map(c => c.close()));
 
     if (this.options.restart) {
@@ -265,6 +272,12 @@ class Puppeteer extends Helper {
       return this._stopBrowser();
     }
 
+    // ensure this.page is from default context
+    if (this.page) {
+      const existingPages = defaultCtx.targets().filter(t => t.type() === 'page');
+      await this._setPage(await existingPages[0].page());
+    }
+
     if (this.options.keepBrowserState) return;
 
     if (!this.options.keepCookies) {
@@ -291,11 +304,13 @@ class Puppeteer extends Helper {
 
   _session() {
     return {
-      start: async () => {
+      start: async (name = '', config) => {
         this.debugSection('Incognito Tab', 'opened');
+        this.activeSessionName = name;
 
         const bc = await this.browser.createIncognitoBrowserContext();
-        await bc.newPage();
+        const page = await bc.newPage();
+
         // Create a new page inside context.
         return bc;
       },
@@ -304,12 +319,21 @@ class Puppeteer extends Helper {
       },
       loadVars: async (context) => {
         const existingPages = context.targets().filter(t => t.type() === 'page');
-        return this._setPage(await existingPages[0].page());
+        this.sessionPages[this.activeSessionName] = await existingPages[0].page();
+        return this._setPage(this.sessionPages[this.activeSessionName]);
       },
-      restoreVars: async () => {
+      restoreVars: async (session) => {
         this.withinLocator = null;
-        const existingPages = await this.browser.targets().filter(t => t.type() === 'page');
+
+        if (!session) {
+          this.activeSessionName = '';
+        } else {
+          this.activeSessionName = session;
+        }
+        const defaultCtx = this.browser.defaultBrowserContext();
+        const existingPages = defaultCtx.targets().filter(t => t.type() === 'page');
         await this._setPage(await existingPages[0].page());
+
         return this._waitForAction();
       },
     };
@@ -361,8 +385,7 @@ class Puppeteer extends Helper {
   }
 
   /**
-   * Checks that the active JavaScript popup, as created by `window.alert|window.confirm|window.prompt`, contains the
-   * given string.
+   * {{> seeInPopup }}
    */
   async seeInPopup(text) {
     popupStore.assertPopupVisible();
@@ -475,6 +498,7 @@ class Puppeteer extends Helper {
     this._setPage(null);
     this.context = null;
     popupStore.clear();
+    this.isAuthenticated = false;
     if (this.isRemoteBrowser) {
       await this.browser.disconnect();
     } else {
@@ -543,10 +567,10 @@ class Puppeteer extends Helper {
       url = this.options.url + url;
     }
 
-    if (this.config.basicAuth && (isAuthenticated !== true)) {
+    if (this.config.basicAuth && (this.isAuthenticated !== true)) {
       if (url.includes(this.options.url)) {
-        this.page.authenticate(this.config.basicAuth);
-        isAuthenticated = true;
+        await this.page.authenticate(this.config.basicAuth);
+        this.isAuthenticated = true;
       }
     }
 
@@ -919,6 +943,36 @@ class Puppeteer extends Helper {
     return proceedClick.call(this, locator, context);
   }
 
+  /**
+   * {{> forceClick }}
+   *
+   * {{ react }}
+   */
+  async forceClick(locator, context = null) {
+    let matcher = await this.context;
+    if (context) {
+      const els = await this._locate(context);
+      assertElementExists(els, context);
+      matcher = els[0];
+    }
+
+    const els = await findClickable.call(this, matcher, locator);
+    if (context) {
+      assertElementExists(els, locator, 'Clickable element', `was not found inside element ${new Locator(context).toString()}`);
+    } else {
+      assertElementExists(els, locator, 'Clickable element');
+    }
+    const elem = els[0];
+    return this.executeScript((el) => {
+      if (document.activeElement instanceof HTMLElement) {
+        document.activeElement.blur();
+      }
+      const event = document.createEvent('MouseEvent');
+      event.initEvent('click', true, true);
+      return el.dispatchEvent(event);
+    }, elem);
+  }
+
   /**
    * {{> clickLink }}
    *
@@ -1185,6 +1239,8 @@ class Puppeteer extends Helper {
 
   /**
    * {{> attachFile }}
+   *
+   * > ⚠ There is an [issue with file upload in Puppeteer 2.1.0 & 2.1.1](https://github.com/puppeteer/puppeteer/issues/5420), downgrade to 2.0.0 if you face it.
    */
   async attachFile(locator, pathToFile) {
     const file = path.join(global.codecept_dir, pathToFile);
@@ -1614,10 +1670,19 @@ class Puppeteer extends Helper {
     const outputFile = screenshotOutputFolder(fileName);
 
     this.debug(`Screenshot is saving to ${outputFile}`);
-    const openSessions = await this.browser.pages();
-    if (openSessions.length > 1) {
-      this.page = await this.browser.targets()[this.browser.targets().length - 1].page();
+
+    if (this.activeSessionName) {
+      const activeSessionPage = this.sessionPages[this.activeSessionName];
+
+      if (activeSessionPage) {
+        return activeSessionPage.screenshot({
+          path: outputFile,
+          fullPage: fullPageOption,
+          type: 'png',
+        });
+      }
     }
+
     return this.page.screenshot({ path: outputFile, fullPage: fullPageOption, type: 'png' });
   }
 
@@ -1898,7 +1963,7 @@ class Puppeteer extends Helper {
         }, { timeout: waitTimeout }, locator.value, text, $XPath.toString());
       }
     } else {
-      waiter = contextObject.waitForFunction(text => document.body.innerText.indexOf(text) > -1, { timeout: waitTimeout }, text);
+      waiter = contextObject.waitForFunction(text => document.body && document.body.innerText.indexOf(text) > -1, { timeout: waitTimeout }, text);
     }
 
     return waiter.catch((err) => {

package/lib/helper/REST.js

@@ -75,7 +75,9 @@ class REST extends Helper {
     }
 
     if ((typeof request.data) === 'string') {
-      request.headers = Object.assign(request.headers, { 'Content-Type': 'application/x-www-form-urlencoded' });
+      if (!request.headers || !request.headers['Content-Type']) {
+        request.headers = Object.assign(request.headers, { 'Content-Type': 'application/x-www-form-urlencoded' });
+      }
     }
 
     if (this.config.onRequest) {

package/lib/helper/TestCafe.js

@@ -1208,7 +1208,7 @@ async function proceedClick(locator, context = null) {
     await assertElementExists(els, locator, 'Clickable element');
   }
 
-  const firstElement = await els.nth(0);
+  const firstElement = await els.filterVisible().nth(0);
 
   return this.t
     .click(firstElement)