fix: respect defaultActiveApplication in activeApplication selection (#…

…862)

* chore: respect defaultActiveApplication

* return immediately if the given defaultActiveApplication was already foreground

* move the foreground check prior than the self.testedApplication

* move is auto detection

WebDriverAgentLib/Routing/FBSession.m

@@ -166,6 +166,13 @@ - (void)kill
 
 - (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 @@ - (XCUIApplication *)activeApplication
     }
   }
 
-  NSString *defaultBundleId = [self.defaultActiveApplication isEqualToString:FBDefaultApplicationAuto]
-    ? nil
-    : self.defaultActiveApplication;
   return [XCUIApplication fb_activeApplicationWithDefaultBundleId:defaultBundleId];
 }