@axe-core/webdriverjs 4.7.3-alpha.397 → 4.7.3

package/dist/index.js

@@ -432,7 +432,14 @@ var AxeBuilder = class {
     if (runPartialSupported !== true || this.legacyMode) {
       return this.runLegacy(context);
     }
-    const partials = await this.runPartialRecursive(context, true);
+    const { pageLoad } = await this.driver.manage().getTimeouts();
+    this.driver.manage().setTimeouts({ pageLoad: 1e3 });
+    let partials;
+    try {
+      partials = await this.runPartialRecursive(context);
+    } finally {
+      this.driver.manage().setTimeouts({ pageLoad });
+    }
     try {
       return await this.finishRun(partials);
     } catch (error2) {
@@ -466,8 +473,8 @@ var AxeBuilder = class {
   /**
    * Get partial results from the current context and its child frames
    */
-  async runPartialRecursive(context, initiator = false) {
-    if (!initiator) {
+  async runPartialRecursive(context, frameStack = []) {
+    if (frameStack.length) {
       await axeSourceInject(this.driver, this.axeSource, this.config);
     }
     const frameContexts = await axeGetFrameContext(this.driver, context);
@@ -475,16 +482,16 @@ var AxeBuilder = class {
       await axeRunPartial(this.driver, context, this.option)
     ];
     for (const { frameContext, frameSelector, frame } of frameContexts) {
-      let switchedFrame = false;
       try {
         (0, import_assert.default)(frame, `Expect frame of "${frameSelector}" to be defined`);
         await this.driver.switchTo().frame(frame);
-        switchedFrame = true;
-        partials.push(...await this.runPartialRecursive(frameContext));
+        partials.push(...await this.runPartialRecursive(frameContext, [...frameStack, frame]));
         await this.driver.switchTo().parentFrame();
       } catch {
-        if (switchedFrame) {
-          await this.driver.switchTo().parentFrame();
+        const win = await this.driver.getWindowHandle();
+        await this.driver.switchTo().window(win);
+        for (const frameElm of frameStack) {
+          await this.driver.switchTo().frame(frameElm);
         }
         partials.push("null");
       }
@@ -497,6 +504,7 @@ var AxeBuilder = class {
   async finishRun(partials) {
     const { driver, axeSource, config, option } = this;
     const win = await driver.getWindowHandle();
+    await driver.switchTo().window(win);
     try {
       await driver.executeScript(`window.open('about:blank')`);
       const handlers = await driver.getAllWindowHandles();

package/dist/index.mjs

@@ -397,7 +397,14 @@ var AxeBuilder = class {
     if (runPartialSupported !== true || this.legacyMode) {
       return this.runLegacy(context);
     }
-    const partials = await this.runPartialRecursive(context, true);
+    const { pageLoad } = await this.driver.manage().getTimeouts();
+    this.driver.manage().setTimeouts({ pageLoad: 1e3 });
+    let partials;
+    try {
+      partials = await this.runPartialRecursive(context);
+    } finally {
+      this.driver.manage().setTimeouts({ pageLoad });
+    }
     try {
       return await this.finishRun(partials);
     } catch (error2) {
@@ -431,8 +438,8 @@ var AxeBuilder = class {
   /**
    * Get partial results from the current context and its child frames
    */
-  async runPartialRecursive(context, initiator = false) {
-    if (!initiator) {
+  async runPartialRecursive(context, frameStack = []) {
+    if (frameStack.length) {
       await axeSourceInject(this.driver, this.axeSource, this.config);
     }
     const frameContexts = await axeGetFrameContext(this.driver, context);
@@ -440,16 +447,16 @@ var AxeBuilder = class {
       await axeRunPartial(this.driver, context, this.option)
     ];
     for (const { frameContext, frameSelector, frame } of frameContexts) {
-      let switchedFrame = false;
       try {
         assert(frame, `Expect frame of "${frameSelector}" to be defined`);
         await this.driver.switchTo().frame(frame);
-        switchedFrame = true;
-        partials.push(...await this.runPartialRecursive(frameContext));
+        partials.push(...await this.runPartialRecursive(frameContext, [...frameStack, frame]));
         await this.driver.switchTo().parentFrame();
       } catch {
-        if (switchedFrame) {
-          await this.driver.switchTo().parentFrame();
+        const win = await this.driver.getWindowHandle();
+        await this.driver.switchTo().window(win);
+        for (const frameElm of frameStack) {
+          await this.driver.switchTo().frame(frameElm);
         }
         partials.push("null");
       }
@@ -462,6 +469,7 @@ var AxeBuilder = class {
   async finishRun(partials) {
     const { driver, axeSource, config, option } = this;
     const win = await driver.getWindowHandle();
+    await driver.switchTo().window(win);
     try {
       await driver.executeScript(`window.open('about:blank')`);
       const handlers = await driver.getAllWindowHandles();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axe-core/webdriverjs",
-  "version": "4.7.3-alpha.397+48e222e",
+  "version": "4.7.3",
   "description": "Provides a method to inject and analyze web pages using axe",
   "contributors": [
     {
@@ -119,5 +119,5 @@
     "functions": 85,
     "lines": 85
   },
-  "gitHead": "48e222e87da6f5ee79a81f61ab2e4cc4cc3e6ae6"
+  "gitHead": "ad1c229716920cbc359553e0bcb2e0b20ac55ac9"
 }