Merge branch 'master' into web_vieport_screenshot

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [7.18.0](https://github.com/appium/appium-xcuitest-driver/compare/v7.17.6...v7.18.0) (2024-06-20)
+
+### Features
+
+* add pageLoadStrategy for Safari/WebView ([#2411](https://github.com/appium/appium-xcuitest-driver/issues/2411)) ([2517bf7](https://github.com/appium/appium-xcuitest-driver/commit/2517bf75d0de0fd00937c4c12c6ca890a49ef218))
+
 ## [7.17.6](https://github.com/appium/appium-xcuitest-driver/compare/v7.17.5...v7.17.6) (2024-06-18)
 
 ### Bug Fixes

docs/reference/capabilities.md

@@ -121,6 +121,7 @@ about capabilities, refer to the [Appium documentation](https://appium.io/docs/e
 
 |<div style="width:10em">Capability</div>|Description|<div style="width:7em">Example</div>|
 |----------|-----------|------|
+|`pageLoadStrategy` | One of the available page load strategies. See https://www.w3.org/TR/webdriver/#capabilities. Default `normal`. | `eager` |
 |`appium:absoluteWebLocations`|This capability will direct the `Get Element Location` command, when used within webviews, to return coordinates which are relative to the origin of the page, rather than relative to the current scroll offset. This capability has no effect outside of webviews. Default `false`.|`true`|
 |`appium:safariGarbageCollect`|Turns on/off Web Inspector garbage collection when executing scripts on Safari. Turning on may improve performance. Defaults to `false`.|`true` or `false`|
 |`appium:includeSafariInWebviews`|Add Safari web contexts to the list of contexts available during a native/webview app test. This is useful if the test opens Safari and needs to be able to interact with it. Defaults to `false`.|`true` or `false`|

lib/commands/context.js

@@ -460,6 +460,7 @@ const helpers = {
         logAllCommunicationHexDump: this.opts.safariLogAllCommunicationHexDump,
         socketChunkSize: this.opts.safariSocketChunkSize,
         webInspectorMaxFrameLength: this.opts.safariWebInspectorMaxFrameLength,
+        pageLoadStrategy: this.caps.pageLoadStrategy,
       },
       this.isRealDevice(),
     );

lib/desired-caps.js

@@ -380,6 +380,10 @@ const desiredCapConstraints = /** @type {const} */ ({
   appTimeZone: {
     isString: true,
   },
+  pageLoadStrategy: {
+    isString: true,
+    inclusionCaseInsensitive: ['none', 'eager', 'normal']
+  }
 });
 
 export {desiredCapConstraints, PLATFORM_NAME_IOS, PLATFORM_NAME_TVOS};

package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "7.17.6",
+  "version": "7.18.0",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -80,7 +80,7 @@
     "appium-idb": "^1.6.13",
     "appium-ios-device": "^2.5.4",
     "appium-ios-simulator": "^6.1.7",
-    "appium-remote-debugger": "^11.1.0",
+    "appium-remote-debugger": "^11.3.0",
     "appium-webdriveragent": "^8.7.0",
     "appium-xcode": "^5.1.4",
     "async-lock": "^1.4.0",