Merge branch '4.x' into add-3.x-commits

Author: kobenguyent

lib/helper/Puppeteer.js

@@ -2945,35 +2945,6 @@ async function findElements(matcher, locator) {
   return []
 }
 
-/**
- * Find a single element using Puppeteer's native element discovery methods
- * Note: Puppeteer Locator API doesn't have .first() method like Playwright
- * @param {Object} matcher - Puppeteer context to search within
- * @param {Object|string} locator - Locator specification
- * @returns {Promise<Object>} Single ElementHandle object
- */
-async function findElement(matcher, locator) {
-  if (locator.react) return findReactElements.call(this, locator)
-  locator = new Locator(locator, 'css')
-  
-  // Check if locator is a role locator and call findByRole
-  if (locator.isRole()) {
-    const elements = await findByRole.call(this, matcher, locator)
-    return elements[0]
-  }
-
-  // Use proven legacy approach - Puppeteer Locator API doesn't have .first() method
-  if (!locator.isXPath()) {
-    const elements = await matcher.$$(locator.simplify())
-    return elements[0]
-  }
-  
-  // For XPath in Puppeteer 24.x+, use the same approach as findElements
-  // $x method was removed, so we use ::-p-xpath() or fallback
-  const elements = await findElements.call(this, matcher, locator)
-  return elements[0]
-}
-
 /**
  * Find a single element using Puppeteer's native element discovery methods
  * Note: Puppeteer Locator API doesn't have .first() method like Playwright

test/data/sandbox/configs/html-reporter-plugin/features/html-reporter.feature

@@ -13,6 +13,7 @@ Feature: HTML Reporter BDD Test
     When I perform an action
     Then I should see the expected result
     And everything should work correctly
+    But I should see the expected result
 
   @regression @critical
   Scenario: Test with data table

test/runner/html-reporter-plugin_test.js

@@ -183,7 +183,7 @@ describe('CodeceptJS html-reporter-plugin', function () {
       expect(reportContent).toContain('data-type=')
 
       // Should contain scenario steps with proper keywords
-      expect(reportContent).toMatch(/Given|When|Then|And/)
+      expect(reportContent).toMatch(/Given|When|Then|And|But/)
 
       done()
     })

test/unit/plugin/screenshotOnFail_test.js

@@ -68,7 +68,8 @@ describe('screenshotOnFail', () => {
     await recorder.promise()
     expect(screenshotSaved.called).is.ok
     const fileName = screenshotSaved.getCall(0).args[0]
-    const regexpFileName = /test1_[0-9]{13}.failed.png/
+    const regexpFileName = /test1_[0-9]{10}.failed.png/
+
     expect(fileName.match(regexpFileName).length).is.equal(1)
   })
 

typings/index.d.ts

@@ -648,9 +648,3 @@ declare module 'codeceptjs/effects' {
   export const retryTo: RetryTo
   export const hopeThat: HopeThat
 }
-
-declare module 'codeceptjs/effects' {
-  export const tryTo: TryTo
-  export const retryTo: RetryTo
-  export const hopeThat: HopeThat
-}