@devicelab/maestro-runner-darwin-arm64 1.1.27 → 1.1.28

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/Info.plist

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>UILaunchScreen</key>
+	<dict/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/SceneDelegate.h

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property (strong, nonatomic) UIWindow *window;
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/SceneDelegate.m

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "SceneDelegate.h"
+#import "ViewController.h"
+
+@implementation SceneDelegate
+
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
+{
+  UIWindowScene *windowScene = (UIWindowScene *)scene;
+  self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
+  self.window.rootViewController = [ViewController new];
+  [self.window makeKeyAndVisible];
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/ViewController.h

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface ViewController : UIViewController
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/ViewController.m

@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "ViewController.h"
+
+static NSInteger const FBGridSize = 3;
+static CGFloat const FBCellSide = 200;
+static CGFloat const FBCellSpacing = 60;
+
+@interface ViewController ()
+@property (nonatomic, strong) UILabel *lastSelectedLabel;
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  self.view.backgroundColor = UIColor.whiteColor;
+
+  UIStackView *rows = [UIStackView new];
+  rows.axis = UILayoutConstraintAxisVertical;
+  rows.spacing = FBCellSpacing;
+  rows.alignment = UIStackViewAlignmentCenter;
+  rows.translatesAutoresizingMaskIntoConstraints = NO;
+  [self.view addSubview:rows];
+
+  for (NSInteger row = 0; row < FBGridSize; row++) {
+    UIStackView *columns = [UIStackView new];
+    columns.axis = UILayoutConstraintAxisHorizontal;
+    columns.spacing = FBCellSpacing;
+    for (NSInteger column = 0; column < FBGridSize; column++) {
+      UIButton *cell = [self newCellWithIdentifier:[NSString stringWithFormat:@"cell_%ld_%ld", (long)row, (long)column]];
+      [columns addArrangedSubview:cell];
+    }
+    [rows addArrangedSubview:columns];
+  }
+
+  UIButton *disabledButton = [self newCellWithIdentifier:@"disabledButton"];
+  disabledButton.enabled = NO;
+  [rows addArrangedSubview:disabledButton];
+
+  self.lastSelectedLabel = [UILabel new];
+  self.lastSelectedLabel.accessibilityIdentifier = @"lastSelectedLabel";
+  self.lastSelectedLabel.text = @"none";
+  self.lastSelectedLabel.translatesAutoresizingMaskIntoConstraints = NO;
+  [self.view addSubview:self.lastSelectedLabel];
+
+  [NSLayoutConstraint activateConstraints:@[
+    [rows.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
+    [rows.centerYAnchor constraintEqualToAnchor:self.view.centerYAnchor],
+    [self.lastSelectedLabel.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor],
+    [self.lastSelectedLabel.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:-FBCellSpacing],
+  ]];
+}
+
+- (UIButton *)newCellWithIdentifier:(NSString *)identifier
+{
+  UIButton *cell = [UIButton buttonWithType:UIButtonTypeSystem];
+  cell.accessibilityIdentifier = identifier;
+  [cell setTitle:identifier forState:UIControlStateNormal];
+  cell.translatesAutoresizingMaskIntoConstraints = NO;
+  [cell.widthAnchor constraintEqualToConstant:FBCellSide].active = YES;
+  [cell.heightAnchor constraintEqualToConstant:FBCellSide].active = YES;
+  [cell addTarget:self action:@selector(didSelectCell:) forControlEvents:UIControlEventPrimaryActionTriggered];
+  return cell;
+}
+
+- (void)didSelectCell:(UIButton *)cell
+{
+  self.lastSelectedLabel.text = cell.accessibilityIdentifier;
+}
+
+@end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_tvOS/main.m

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import "AppDelegate.h"
+
+int main(int argc, char * argv[]) {
+  @autoreleasepool {
+      return UIApplicationMain(argc, argv, nil, NSStringFromClass(AppDelegate.class));
+  }
+}

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_watchOS/ContentView.swift

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import SwiftUI
+
+struct ContentView: View {
+  @State private var resultText = "Idle"
+  @State private var typedText = ""
+
+  var body: some View {
+    // ScrollView keeps content reachable - WDA's test-launch path shifts the scene down
+    // vs. a plain launch, which can push a plain VStack off-screen.
+    ScrollView {
+      VStack(spacing: 8) {
+        Text(resultText)
+          .accessibilityIdentifier("resultLabel")
+        Button("Tap Me") {
+          resultText = "Tapped"
+        }
+        .accessibilityIdentifier("tapMeButton")
+        TextField("Type here", text: $typedText)
+          .accessibilityIdentifier("typingField")
+      }
+    }
+  }
+}

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationApp_watchOS/WatchSpikeApp.swift

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import SwiftUI
+
+@main
+struct WatchSpikeApp: App {
+  var body: some Scene {
+    WindowGroup {
+      ContentView()
+    }
+  }
+}

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBAlertTests.m

@@ -27,7 +27,7 @@
   [self resetPermissions];
   [self launchApplication];
   [self goToAlertsPage];
-  [FBConfiguration disableApplicationUIInterruptionsHandling];
+  [FBConfiguration.sharedInstance disableApplicationUIInterruptionsHandling];
 }
 
 - (void)resetPermissions
@@ -69,126 +69,107 @@
 
 - (void)testAlertPresence
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse(alert.isPresent);
+  XCTAssertFalse([FBAlert alertWithApplication:self.testedApplication].isPresent);
   [self showApplicationAlert];
-  XCTAssertTrue(alert.isPresent);
+  XCTAssertTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAlertText
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self showApplicationAlert];
-  XCTAssertTrue([alert.text containsString:@"Magic"]);
-  XCTAssertTrue([alert.text containsString:@"Should read"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Magic"]);
+  XCTAssertTrue([text containsString:@"Should read"]);
 }
 
 - (void)testAlertLabels
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.buttonLabels);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].buttonLabels);
   [self showApplicationAlert];
-  XCTAssertNotNil(alert.buttonLabels);
-  XCTAssertEqual(1, alert.buttonLabels.count);
-  XCTAssertEqualObjects(@"Will do", alert.buttonLabels[0]);
+  NSArray *labels = [FBAlert alertWithApplication:self.testedApplication].buttonLabels;
+  XCTAssertNotNil(labels);
+  XCTAssertEqual(1, labels.count);
+  XCTAssertEqualObjects(@"Will do", labels[0]);
 }
 
 - (void)testClickAlertButton
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
   [self showApplicationAlert];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
-  XCTAssertTrue([alert clickAlertButton:@"Will do" error:nil]);
-  FBAssertWaitTillBecomesTrue(!alert.isPresent);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Will do"]);
+  FBAssertWaitTillBecomesTrue(![FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAcceptingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testAcceptingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
-  [FBConfiguration setAcceptAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
+  FBConfiguration.sharedInstance.acceptAlertButtonSelector = @"**/XCUIElementTypeButton[-1]";
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
-    [FBConfiguration setAcceptAlertButtonSelector:@""];
+    FBConfiguration.sharedInstance.acceptAlertButtonSelector = @"";
   }
 }
 
 - (void)testDismissingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testDismissingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
-  [FBConfiguration setDismissAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
+  FBConfiguration.sharedInstance.dismissAlertButtonSelector = @"**/XCUIElementTypeButton[-1]";
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
-    [FBConfiguration setDismissAlertButtonSelector:@""];
+    FBConfiguration.sharedInstance.dismissAlertButtonSelector = @"";
   }
 }
 
-- (void)testAlertElement
-{
-  [self showApplicationAlert];
-  XCUIElement *alertElement = [FBAlert alertWithApplication:self.testedApplication].alertElement;
-  XCTAssertTrue(alertElement.exists);
-  XCTAssertTrue(alertElement.elementType == XCUIElementTypeAlert);
-}
-
 - (void)testNotificationAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self.testedApplication.buttons[@"Create Notification Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"Would Like to Send You Notifications"]);
-  XCTAssertTrue([alert.text containsString:@"Notifications may include"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Would Like to Send You Notifications"]);
+  XCTAssertTrue([text containsString:@"Notifications may include"]);
 }
 
 - (void)testCameraRollAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create Camera Roll Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testGPSAccessAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create GPS access Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"location"]);
-  XCTAssertTrue([alert.text containsString:@"Yo Yo"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"location"]);
+  XCTAssertTrue([text containsString:@"Yo Yo"]);
 }
 
 @end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m

@@ -44,9 +44,12 @@
   [super tearDown];
 }
 
-// The test is flaky on slow Travis CI
-- (void)disabled_testAutoAcceptingOfAlerts
+- (void)testAutoAcceptingOfAlerts
 {
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Flaky on slow CI machines");
+  }
+
   self.session = [FBSession
                   initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"accept"];
@@ -57,9 +60,12 @@
   }
 }
 
-// The test is flaky on slow Travis CI
-- (void)disabled_testAutoDismissingOfAlerts
+- (void)testAutoDismissingOfAlerts
 {
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Flaky on slow CI machines");
+  }
+
   self.session = [FBSession
                   initWithApplication:XCUIApplication.fb_activeApplication
                   defaultAlertAction:@"dismiss"];

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m

@@ -11,6 +11,9 @@
 
 #import "FBConfiguration.h"
 #import "FBRuntimeUtils.h"
+#import "FBTestMacros.h"
+#import "XCUIElement.h"
+#import "XCUIElement+FBIsVisible.h"
 
 @interface FBConfigurationTests : FBIntegrationTestCase
 
@@ -18,21 +21,51 @@
 
 @implementation FBConfigurationTests
 
-- (void)setUp
+- (void)testReduceMotion
 {
-  [super setUp];
   [self launchApplication];
+
+  BOOL defaultReduceMotionEnabled = FBConfiguration.sharedInstance.reduceMotionEnabled;
+
+  FBConfiguration.sharedInstance.reduceMotionEnabled = YES;
+  XCTAssertTrue(FBConfiguration.sharedInstance.reduceMotionEnabled);
+
+  FBConfiguration.sharedInstance.reduceMotionEnabled = defaultReduceMotionEnabled;
+  XCTAssertEqual(FBConfiguration.sharedInstance.reduceMotionEnabled, defaultReduceMotionEnabled);
 }
 
-- (void)testReduceMotion
+- (void)testAccessibilityDeadlineAbortsSnapshotRequestForDeadlockedApp
 {
-  BOOL defaultReduceMotionEnabled = [FBConfiguration reduceMotionEnabled];
+  if (FBIntegrationTestCase.isRunningInCI) {
+    XCTSkip(@"Deliberately freezes the app for several seconds, too slow/flaky for CI");
+  }
+
+  // Launch only after the CI skip so a skipped test cannot time out in app startup.
+  [self launchApplication];
+
+  NSTimeInterval previousDeadline = FBConfiguration.sharedInstance.accessibilityDeadline;
+  // Also bounds any snapshot-based wait -tap itself may perform once the app is stuck.
+  FBConfiguration.sharedInstance.accessibilityDeadline = 3.0;
+  @try {
+    XCUIElement *deadlockButton = self.testedApplication.buttons[@"Deadlock app"];
+    FBAssertWaitTillBecomesTrue(deadlockButton.fb_isVisible);
+    // Freezes the app's main thread for 20s - see -[ViewController deadlockApp:].
+    [deadlockButton tap];
 
-  [FBConfiguration setReduceMotionEnabled:YES];
-  XCTAssertTrue([FBConfiguration reduceMotionEnabled]);
+    NSError *error;
+    NSDate *start = [NSDate date];
+    id snapshot = [self.testedApplication snapshotWithError:&error];
+    NSTimeInterval elapsed = -start.timeIntervalSinceNow;
 
-  [FBConfiguration setReduceMotionEnabled:defaultReduceMotionEnabled];
-  XCTAssertEqual([FBConfiguration reduceMotionEnabled], defaultReduceMotionEnabled);
+    XCTAssertNil(snapshot);
+    XCTAssertNotNil(error);
+    // Should abort close to accessibilityDeadline (plus XCTest's own internal
+    // retries), not hang indefinitely waiting for the frozen app (#1210).
+    XCTAssertLessThan(elapsed, 20.0);
+  } @finally {
+    FBConfiguration.sharedInstance.accessibilityDeadline = previousDeadline;
+    [self.testedApplication terminate];
+  }
 }
 
 @end

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m

@@ -41,6 +41,15 @@
   XCTAssertFalse(buttonElement.isWDAccessibilityContainer);
 }
 
+- (void)testNativeAccessibilityElementAttribute
+{
+  // wdNativeAccessibilityElement must expose the raw, native isAccessibilityElement flag
+  // without WebDriverAgent's custom computation applied by wdAccessible
+  XCUIElement *buttonElement = self.testedApplication.buttons[@"Button"];
+  XCTAssertTrue(buttonElement.exists);
+  XCTAssertEqual(buttonElement.wdNativeAccessibilityElement, buttonElement.fb_isAccessibilityElement);
+}
+
 - (void)testContainerAccessibilityAttributes
 {
   // "not_accessible" isn't accessibility element, but contains accessibility elements, so it is accessibility container
@@ -57,7 +66,7 @@
   // Images are neither accessibility elements nor contain them, so both checks should fail
   XCUIElement *imageElement = self.testedApplication.images.allElementsBoundByIndex.firstObject;
   if (nil == imageElement) {
-    return;
+    XCTSkip(@"No image element available to test");
   }
   
   XCTAssertTrue(imageElement.exists);

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBElementSwipingTests.m

@@ -93,10 +93,10 @@
 - (void)setUp
 {
   [super setUp];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    [self openScrollView];
-  });
+  // Each test (and retry) must start at row zero, not at the previous test's
+  // scroll offset. A velocity-based swipe need not undo an earlier swipe.
+  [self resetOrientation];
+  [self openScrollView];
 }
 
 - (void)testSwipeUp

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -13,6 +13,7 @@
 #import "FBTestMacros.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "XCUIElement+FBUtilities.h"
 
 @interface FBElementVisibilityTests : FBIntegrationTestCase
 @end
@@ -22,36 +23,30 @@
 - (void)testSpringBoardIcons
 {
   if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
-    return;
+    XCTSkip(@"Not applicable to iPad");
   }
   [self launchApplication];
   [self goToSpringBoardFirstPage];
+  [self.springboard fb_waitUntilStable];
 
-  // Check Icons on first screen
-  // Note: Calender app exits 2 (an app icon + a widget) exist on the home screen
-  // on iOS 15+. The firstMatch is for it.
-  XCTAssertTrue(self.springboard.icons[@"Calendar"].firstMatch.fb_isVisible);
-  XCTAssertTrue(self.springboard.icons[@"Reminders"].fb_isVisible);
+  // Calendar can match both its app icon and a widget on iOS 15+.
+  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Calendar"].firstMatch.fb_isVisible);
+  // Safari is in the dock; Reminders is not reliably visible on the first page
+  // of CI simulators. Wait for the Home transition before checking visibility.
+  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Safari"].firstMatch.fb_isVisible);
 
-  // Check Icons on second screen screen
+  // Check the fixture icon on another page.
   XCTAssertFalse(self.springboard.icons[@"IntegrationApp"].firstMatch.fb_isVisible);
 }
 
-- (void)testSpringBoardSubfolder
+- (void)testIconsFromSearchDashboard
 {
-  if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad
-      || SYSTEM_VERSION_GREATER_THAN(@"12.0")) {
-    return;
+  if (FBIntegrationTestCase.isRunningInCI) {
+    // Causes: Failure fetching attributes for element <XCAccessibilityElement>
+    // Device element: Error Domain=XCTDaemonErrorDomain Code=13 "Value for attribute 5017 is an error."
+    XCTSkip(@"Fails with XCTDaemonErrorDomain Code=13 on CI simulators");
   }
-  [self launchApplication];
-  [self goToSpringBoardExtras];
-  XCTAssertFalse(self.springboard.icons[@"Extras"].otherElements[@"Contacts"].fb_isVisible);
-}
 
-- (void)disabled_testIconsFromSearchDashboard
-{
-  // This test causes:
-  // Failure fetching attributes for element <XCAccessibilityElement: 0x60800044dd10> Device element: Error Domain=XCTDaemonErrorDomain Code=13 "Value for attribute 5017 is an error." UserInfo={NSLocalizedDescription=Value for attribute 5017 is an error.}
   [self launchApplication];
   [self goToSpringBoardDashboard];
   XCTAssertFalse(self.springboard.icons[@"Reminders"].fb_isVisible);

package/drivers/ios/WebDriverAgent/WebDriverAgentTests/IntegrationTests/FBForceTouchTests.m

@@ -57,8 +57,11 @@
 
 - (void)testForceTap
 {
+  XCTSkipIf(SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"27.0"),
+            @"FIXME: Unstable on platform version 27.");
+
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationPortrait];
@@ -67,7 +70,7 @@
 - (void)testForceTapInLandscapeLeft
 {
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeLeft];
@@ -76,7 +79,7 @@
 - (void)testForceTapInLandscapeRight
 {
   if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
-    return;
+    XCTSkip(@"Device does not support pressure interaction");
   }
 
   [self verifyForceTapWithOrientation:UIDeviceOrientationLandscapeRight];