appium-webdriveragent 7.1.0 → 7.1.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [7.1.2](https://github.com/appium/WebDriverAgent/compare/v7.1.1...v7.1.2) (2024-03-14)
+
+
+### Bug Fixes
+
+* Always assume en0 is the WiFi interface ([#864](https://github.com/appium/WebDriverAgent/issues/864)) ([6dbfb3f](https://github.com/appium/WebDriverAgent/commit/6dbfb3f2ec8e0bfa5a42c6f8ab882893bfe3f534))
+
+## [7.1.1](https://github.com/appium/WebDriverAgent/compare/v7.1.0...v7.1.1) (2024-03-13)
+
+
+### Bug Fixes
+
+* respect defaultActiveApplication in activeApplication selection ([#862](https://github.com/appium/WebDriverAgent/issues/862)) ([b1ddae2](https://github.com/appium/WebDriverAgent/commit/b1ddae2be3fd3f7c87de79e804d82cf7c13dc56e))
+
 ## [7.1.0](https://github.com/appium/WebDriverAgent/compare/v7.0.6...v7.1.0) (2024-03-07)
 
 

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h

@@ -70,7 +70,7 @@ typedef NS_ENUM(NSUInteger, FBUIInterfaceAppearance) {
 - (nullable NSData *)fb_screenshotWithError:(NSError*__autoreleasing*)error;
 
 /**
- Returns device current wifi ip4 address
+ Returns device's current wifi ip4 address
  */
 - (nullable NSString *)fb_wifiIPAddress;
 

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -134,7 +134,7 @@ static bool fb_isLocked;
       continue;
     }
     NSString *interfaceName = [NSString stringWithUTF8String:temp_addr->ifa_name];
-    if(![interfaceName containsString:@"en"]) {
+    if(![interfaceName isEqualToString:@"en0"]) {
       temp_addr = temp_addr->ifa_next;
       continue;
     }

package/WebDriverAgentLib/Routing/FBSession.m

@@ -166,6 +166,13 @@ static FBSession *_activeSession = nil;
 
 - (XCUIApplication *)activeApplication
 {
+  BOOL isAuto = [self.defaultActiveApplication isEqualToString:FBDefaultApplicationAuto];
+  NSString *defaultBundleId = isAuto ? nil : self.defaultActiveApplication;
+
+  if (nil != defaultBundleId && [self applicationStateWithBundleId:defaultBundleId] >= XCUIApplicationStateRunningForeground) {
+    return [self makeApplicationWithBundleId:defaultBundleId];
+  }
+
   if (nil != self.testedApplication) {
     XCUIApplicationState testedAppState = self.testedApplication.state;
     if (testedAppState >= XCUIApplicationStateRunningForeground) {
@@ -177,9 +184,6 @@ static FBSession *_activeSession = nil;
     }
   }
 
-  NSString *defaultBundleId = [self.defaultActiveApplication isEqualToString:FBDefaultApplicationAuto]
-    ? nil
-    : self.defaultActiveApplication;
   return [XCUIApplication fb_activeApplicationWithDefaultBundleId:defaultBundleId];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {