codeceptjs 4.2.1-beta.1 → 4.2.1-beta.2

package/docs/helpers/Lightpanda.md

@@ -62,7 +62,7 @@ These are set automatically and only need overriding for unusual setups:
 
 ## Limitations
 
-*   No screenshots and no screencast: `saveScreenshot` throws.
+*   No screenshots and no screencast: `saveScreenshot` and `saveElementScreenshot` do nothing (a debug message is printed).
 *   No frames or popups.
 *   No scrolling: scroll positions always stay at 0.
 *   Computed styles cover what visibility checks need (`display`, `visibility`, `opacity`,

package/lib/helper/CDPBrowser.js

@@ -7,7 +7,9 @@ import Helper from '@codeceptjs/helper'
 import CDPConnection from './extras/CDPConnection.js'
 import installCodeceptClient from './clientscripts/cdpBrowserClient.js'
 import xpathPolyfillSource from './clientscripts/xpathPolyfill.js'
+import layoutProbe from './clientscripts/layoutProbe.js'
 import Locator from '../locator.js'
+import output from '../output.js'
 import store from '../store.js'
 import { xpathLocator, normalizePath, resolveUrl, toCamelCase, convertCssPropertiesToCamelCase, normalizeSpacesInString, fileExists, base64EncodeFile, getMimeType, isFile, isWindows } from '../utils.js'
 import ElementNotFound from './errors/ElementNotFound.js'
@@ -357,8 +359,20 @@ class CDPBrowser extends Helper {
     await this.cdp.connect()
   }
 
+  _beforeStep() {
+    if (this._connectError) throw new Error(this._connectError.message)
+  }
+
   async _before() {
-    if (!this.cdp || !this.cdp.isConnected) await this._connect()
+    this._connectError = null
+    if (!this.cdp || !this.cdp.isConnected) {
+      try {
+        await this._connect()
+      } catch (err) {
+        this._connectError = err
+        throw err
+      }
+    }
     this._navStartWaiters = []
     this._lastMainFrameNav = { loaderId: null, events: {} }
     const { targetId } = await this.cdp.send('Target.createTarget', { url: 'about:blank' })
@@ -595,8 +609,8 @@ class CDPBrowser extends Helper {
 
   async _probeCapabilities() {
     if (this.capabilities.layout === null) {
-      const display = await this._evaluate(`getComputedStyle(document.documentElement).display`)
-      this.capabilities.layout = display === '' ? 'none' : 'real'
+      const display = await this._evaluate(`(${layoutProbe.toString()})()`)
+      this.capabilities.layout = display === 'none' ? 'real' : 'none'
     }
     if (this.capabilities.screenshot === null) {
       this.capabilities.screenshot = this.capabilities.layout === 'real'
@@ -610,6 +624,13 @@ class CDPBrowser extends Helper {
     if (this.capabilities.innerText === null) {
       await this._needsVisibleTextFallback()
     }
+    if (!this._engineReported) {
+      this._engineReported = true
+      let engine = 'render (layout and screenshots)'
+      if (this.capabilities.layout === 'none') engine = 'no-render (DOM only: no layout, visibility checks or screenshots)'
+      else if (!this.capabilities.screenshot) engine = 'layout without screenshots'
+      output.print(`${this.constructor.name} engine: ${engine}`)
+    }
   }
 
   async _run(candidates, action, payload, context = null) {
@@ -807,7 +828,8 @@ class CDPBrowser extends Helper {
     const useWalker = await this._needsVisibleTextFallback()
     const res = await this._runTextCheck(text, { ignoreCase, useWalker })
     if (negate ? !res.found : res.found) return
-    let source = await this._textSource(null)
+    let source = res.text
+    if (source === undefined) source = await this._textSource(null)
     let needle = text
     if (ignoreCase) {
       needle = needle.toLowerCase()
@@ -1343,7 +1365,8 @@ class CDPBrowser extends Helper {
    */
   async saveScreenshot(fileName) {
     if (this.capabilities.screenshot === false) {
-      throw new Error('saveScreenshot is not supported: this browser has no rendering engine')
+      this.debug('saveScreenshot skipped: this browser has no rendering engine')
+      return
     }
     const outputDir = global.output_dir || '.'
     const res = await this.cdp.send('Page.captureScreenshot', { format: 'png' }, this.sessionId)
@@ -1355,7 +1378,8 @@ class CDPBrowser extends Helper {
    */
   async saveElementScreenshot(locator, fileName) {
     if (this.capabilities.screenshot === false) {
-      throw new Error('saveElementScreenshot is not supported: this browser has no rendering engine')
+      this.debug('saveElementScreenshot skipped: this browser has no rendering engine')
+      return
     }
     const res = await this._run(this._candidates(locator), 'rect')
     if (!res.found) throw new ElementNotFound(locator)

package/lib/helper/Lightpanda.js

@@ -72,7 +72,7 @@ const config = {}
  *
  * ## Limitations
  *
- * - No screenshots and no screencast: `saveScreenshot` throws.
+ * - No screenshots and no screencast: `saveScreenshot` and `saveElementScreenshot` do nothing (a debug message is printed).
  * - No frames or popups.
  * - No scrolling: scroll positions always stay at 0.
  * - Computed styles cover what visibility checks need (`display`, `visibility`, `opacity`,

package/lib/helper/clientscripts/cdpBrowserClient.js

@@ -76,7 +76,7 @@ export default function installCodeceptClient(xpathNeedsPolyfill) {
     const hayCmp = opts.ignoreCase ? hay.toLowerCase() : hay
     const needleCmp = opts.ignoreCase ? needleNorm.toLowerCase() : needleNorm
     const idx = hayCmp.indexOf(needleCmp)
-    if (idx === -1) return { found: false, snippet: null }
+    if (idx === -1) return { found: false, snippet: null, text: hay }
     const from = Math.max(0, idx - 60)
     return { found: true, snippet: hay.slice(from, idx + needleNorm.length + 60) }
   }

package/lib/helper/clientscripts/layoutProbe.js

@@ -0,0 +1,12 @@
+export default function layoutProbe() {
+  const style = document.createElement('style')
+  style.textContent = '.__codecept-layout-probe{display:none}'
+  document.documentElement.appendChild(style)
+  const probe = document.createElement('div')
+  probe.className = '__codecept-layout-probe'
+  ;(document.body || document.documentElement).appendChild(probe)
+  const display = getComputedStyle(probe).display
+  style.remove()
+  probe.remove()
+  return display
+}

package/lib/helper/extras/CDPConnection.js

@@ -1,4 +1,7 @@
 import { WebSocket } from 'ws'
+import debugModule from 'debug'
+
+const debug = debugModule('codeceptjs:cdp')
 
 class CDPConnection {
   constructor(endpoint, options = {}) {
@@ -9,6 +12,7 @@ class CDPConnection {
     this.lastId = 0
     this.pending = new Map()
     this.listeners = new Map()
+    this.totals = {}
   }
 
   async connect() {
@@ -49,7 +53,7 @@ class CDPConnection {
         this.pending.delete(id)
         reject(new Error(`CDP command ${method} timed out after ${this.timeout}ms`))
       }, this.timeout)
-      this.pending.set(id, { resolve, reject, timer })
+      this.pending.set(id, { resolve, reject, timer, method, started: Date.now() })
       this.ws.send(JSON.stringify(message))
     })
   }
@@ -61,9 +65,12 @@ class CDPConnection {
 
   _onMessage(msg) {
     if (msg.id && this.pending.has(msg.id)) {
-      const { resolve, reject, timer } = this.pending.get(msg.id)
+      const { resolve, reject, timer, method, started } = this.pending.get(msg.id)
       clearTimeout(timer)
       this.pending.delete(msg.id)
+      const ms = Date.now() - started
+      this.totals[method] = (this.totals[method] || 0) + ms
+      debug(`${method} ${ms}ms`)
       if (msg.error) reject(new Error(msg.error.message))
       else resolve(msg.result)
       return
@@ -80,6 +87,7 @@ class CDPConnection {
 
   async close() {
     if (!this.ws) return
+    debug('total time per method', this.totals)
     await new Promise(resolve => {
       if (this.ws.readyState === WebSocket.CLOSED) return resolve()
       this.ws.once('close', resolve)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "4.2.1-beta.1",
+  "version": "4.2.1-beta.2",
   "type": "module",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [

package/typings/promiseBasedTypes.d.ts

@@ -3438,7 +3438,7 @@ declare namespace CodeceptJS {
      *
      * ## Limitations
      *
-     * - No screenshots and no screencast: `saveScreenshot` throws.
+     * - No screenshots and no screencast: `saveScreenshot` and `saveElementScreenshot` do nothing (a debug message is printed).
      * - No frames or popups.
      * - No scrolling: scroll positions always stay at 0.
      * - Computed styles cover what visibility checks need (`display`, `visibility`, `opacity`,

package/typings/types.d.ts

@@ -3541,7 +3541,7 @@ declare namespace CodeceptJS {
      *
      * ## Limitations
      *
-     * - No screenshots and no screencast: `saveScreenshot` throws.
+     * - No screenshots and no screencast: `saveScreenshot` and `saveElementScreenshot` do nothing (a debug message is printed).
      * - No frames or popups.
      * - No scrolling: scroll positions always stay at 0.
      * - Computed styles cover what visibility checks need (`display`, `visibility`, `opacity`,