codeceptjs 4.0.0-rc.15 → 4.0.0-rc.17

package/lib/command/check.js

@@ -155,7 +155,6 @@ export default async function (options) {
     checks.teardown = true
     for (const helper of Object.values(helpers).reverse()) {
       try {
-        if (helper._passed) await helper._passed(test)
         if (helper._after) await helper._after(test)
         if (helper._finishTest) await helper._finishTest(suite)
         if (helper._afterSuite) await helper._afterSuite(suite)

package/lib/helper/extras/richTextEditor.js

@@ -7,13 +7,13 @@ const EDITOR = {
   IFRAME: 'iframe',
   CONTENTEDITABLE: 'contenteditable',
   HIDDEN_TEXTAREA: 'hidden-textarea',
+  UNREACHABLE: 'unreachable',
 }
 
 function detectAndMark(el, opts) {
   const marker = opts.marker
   const kinds = opts.kinds
   const CE = '[contenteditable="true"], [contenteditable=""]'
-  const MAX_HIDDEN_ASCENT = 3
 
   function mark(kind, target) {
     document.querySelectorAll('[' + marker + ']').forEach(n => n.removeAttribute(marker))
@@ -27,38 +27,76 @@ function detectAndMark(el, opts) {
   if (tag === 'IFRAME') return mark(kinds.IFRAME, el)
   if (el.isContentEditable) return mark(kinds.CONTENTEDITABLE, el)
 
+  const isFormHidden = tag === 'INPUT' && el.type === 'hidden'
+  if ((tag === 'INPUT' || tag === 'TEXTAREA') && !isFormHidden) {
+    const style = window.getComputedStyle(el)
+    if (style.display === 'none') return mark(kinds.UNREACHABLE, el)
+  }
+
   const canSearchDescendants = tag !== 'INPUT' && tag !== 'TEXTAREA'
   if (canSearchDescendants) {
     const iframe = el.querySelector('iframe')
     if (iframe) return mark(kinds.IFRAME, iframe)
     const ce = el.querySelector(CE)
     if (ce) return mark(kinds.CONTENTEDITABLE, ce)
-    const textarea = el.querySelector('textarea')
+    const textareas = [...el.querySelectorAll('textarea')]
+    const focusable = textareas.find(t => window.getComputedStyle(t).display !== 'none')
+    const textarea = focusable || textareas[0]
     if (textarea) return mark(kinds.HIDDEN_TEXTAREA, textarea)
   }
 
-  const style = window.getComputedStyle(el)
-  const isHidden =
-    el.offsetParent === null ||
-    (el.offsetWidth === 0 && el.offsetHeight === 0) ||
-    style.display === 'none' ||
-    style.visibility === 'hidden'
-  if (!isHidden) return mark(kinds.STANDARD, el)
+  return mark(kinds.STANDARD, el)
+}
+
+function detectInsideFrame() {
+  const MARKER = 'data-codeceptjs-rte-target'
+  const CE = '[contenteditable="true"], [contenteditable=""]'
+  const CONTENTEDITABLE = 'contenteditable'
+  const HIDDEN_TEXTAREA = 'hidden-textarea'
+  const body = document.body
+  document.querySelectorAll('[' + MARKER + ']').forEach(n => n.removeAttribute(MARKER))
 
-  const isFormHidden = tag === 'INPUT' && el.type === 'hidden'
-  if (isFormHidden) return mark(kinds.STANDARD, el)
-
-  let scope = el.parentElement
-  for (let depth = 0; scope && depth < MAX_HIDDEN_ASCENT; depth++, scope = scope.parentElement) {
-    const iframeNear = scope.querySelector('iframe')
-    if (iframeNear) return mark(kinds.IFRAME, iframeNear)
-    const ceNear = scope.querySelector(CE)
-    if (ceNear) return mark(kinds.CONTENTEDITABLE, ceNear)
-    const textareaNear = [...scope.querySelectorAll('textarea')].find(t => t !== el)
-    if (textareaNear) return mark(kinds.HIDDEN_TEXTAREA, textareaNear)
+  if (body.isContentEditable) return CONTENTEDITABLE
+
+  const ce = body.querySelector(CE)
+  if (ce) {
+    ce.setAttribute(MARKER, '1')
+    return CONTENTEDITABLE
   }
 
-  return mark(kinds.STANDARD, el)
+  const textareas = [...body.querySelectorAll('textarea')]
+  const focusable = textareas.find(t => window.getComputedStyle(t).display !== 'none')
+  const textarea = focusable || textareas[0]
+  if (textarea) {
+    textarea.setAttribute(MARKER, '1')
+    return HIDDEN_TEXTAREA
+  }
+
+  return CONTENTEDITABLE
+}
+
+async function evaluateInFrame(helper, body, fn) {
+  if (body.helperType === 'webdriver') {
+    return helper.executeScript(fn)
+  }
+  return body.element.evaluate(fn)
+}
+
+function focusMarkedInFrameScript() {
+  const el = document.querySelector('[data-codeceptjs-rte-target]') || document.body
+  el.focus()
+  return document.activeElement === el
+}
+
+function selectAllInFrameScript() {
+  const el = document.querySelector('[data-codeceptjs-rte-target]') || document.body
+  el.focus()
+  const range = document.createRange()
+  range.selectNodeContents(el)
+  const sel = window.getSelection()
+  sel.removeAllRanges()
+  sel.addRange(range)
+  return document.activeElement === el
 }
 
 function selectAllInEditable(el) {
@@ -76,6 +114,17 @@ function unmarkAll(marker) {
   document.querySelectorAll('[' + marker + ']').forEach(n => n.removeAttribute(marker))
 }
 
+function isActive(el) {
+  return el.ownerDocument.activeElement === el
+}
+
+async function assertFocused(target) {
+  const focused = await target.evaluate(isActive)
+  if (!focused) {
+    throw new Error('fillField: rich editor target did not accept focus. Locator must point at the visible editor surface (a wrapper, iframe, or contenteditable) — not a hidden backing element.')
+  }
+}
+
 async function findMarked(helper) {
   const root = helper.page || helper.browser
   const raw = await root.$('[' + MARKER + ']')
@@ -91,22 +140,36 @@ export async function fillRichEditor(helper, el, value) {
   const source = el instanceof WebElement ? el : new WebElement(el, helper)
   const kind = await source.evaluate(detectAndMark, { marker: MARKER, kinds: EDITOR })
   if (kind === EDITOR.STANDARD) return false
+  if (kind === EDITOR.UNREACHABLE) {
+    throw new Error('fillField: cannot fill a display:none form control. Locator must point at the visible editor surface (a wrapper, iframe, or contenteditable).')
+  }
 
   const target = await findMarked(helper)
   const delay = helper.options.pressKeyDelay
 
   if (kind === EDITOR.IFRAME) {
     await target.inIframe(async body => {
-      await body.evaluate(selectAllInEditable)
-      await body.typeText(value, { delay })
+      const innerKind = await evaluateInFrame(helper, body, detectInsideFrame)
+      if (innerKind === EDITOR.HIDDEN_TEXTAREA) {
+        const focused = await evaluateInFrame(helper, body, focusMarkedInFrameScript)
+        if (!focused) throw new Error('fillField: rich editor target inside iframe did not accept focus.')
+        await body.selectAllAndDelete()
+        await body.typeText(value, { delay })
+      } else {
+        const focused = await evaluateInFrame(helper, body, selectAllInFrameScript)
+        if (!focused) throw new Error('fillField: rich editor target inside iframe did not accept focus.')
+        await body.typeText(value, { delay })
+      }
     })
   } else if (kind === EDITOR.HIDDEN_TEXTAREA) {
     await target.focus()
+    await assertFocused(target)
     await target.selectAllAndDelete()
     await target.typeText(value, { delay })
   } else if (kind === EDITOR.CONTENTEDITABLE) {
     await target.click()
     await target.evaluate(selectAllInEditable)
+    await assertFocused(target)
     await target.typeText(value, { delay })
   }
 

package/lib/locator.js

@@ -591,13 +591,24 @@ Locator.clickable = {
       `.//*[@title = ${literal}]`,
       `.//*[@aria-labelledby = //*[@id][normalize-space(string(.)) = ${literal}]/@id ]`,
       `.//*[@role='button'][normalize-space(.)=${literal}]`,
+      `.//*[@role='tab' or @role='link' or @role='menuitem' or @role='menuitemcheckbox' or @role='menuitemradio' or @role='option' or @role='treeitem'][contains(normalize-space(string(.)), ${literal})]`,
     ]),
 
   /**
    * @param {string} literal
    * @returns {string}
    */
-  self: literal => `./self::*[contains(normalize-space(string(.)), ${literal}) or contains(normalize-space(@value), ${literal})]`,
+  self: literal => {
+    // Narrowest-match: prefer the deepest descendant whose string-value contains the literal.
+    // Falling back to `self` without the `not(descendant...)` guard would match a container
+    // whose concatenated text happens to include the literal (e.g. a <ul role="tablist"> whose
+    // tab labels all sit in its string-value) and click the container itself.
+    const narrowest = `contains(normalize-space(string(.)), ${literal}) and not(.//*[contains(normalize-space(string(.)), ${literal})])`
+    return xpathLocator.combine([
+      `.//*[${narrowest}]`,
+      `./self::*[${narrowest} or contains(normalize-space(@value), ${literal})]`,
+    ])
+  },
 }
 
 Locator.field = {

package/package.json

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