From d4d254c5c33a19c21588f056460cd218ea62b147 Mon Sep 17 00:00:00 2001
From: Brian Lin <linbrian@google.com>
Date: Tue, 8 Oct 2024 10:31:31 -0700
Subject: [PATCH] Internal

PiperOrigin-RevId: 683676834
---
 Tests/Functional/Sources/BaseIntegrationTest.m | 15 +++++++++++++++
 Tests/Functional/Sources/PresentedViewTest.m   |  1 +
 Tests/TestRig/Sources/MainViewController.m     |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Tests/Functional/Sources/BaseIntegrationTest.m b/Tests/Functional/Sources/BaseIntegrationTest.m
index 60ea35340..94e75cb30 100644
--- a/Tests/Functional/Sources/BaseIntegrationTest.m
+++ b/Tests/Functional/Sources/BaseIntegrationTest.m
@@ -33,6 +33,14 @@ - (void)setUp {
     [NSObject edo_disallowRemoteInvocationWithExclusion:@[ [NSArray class], [NSEnumerator class] ]];
     [self.application launch];
   });
+
+  for (UIScene* scene in UIApplication.sharedApplication.connectedScenes) {
+    UIWindowScene* windowScene = (UIWindowScene*)scene;
+    for (UIWindow* window in windowScene.windows) {
+      [[window layer] setSpeed:100];
+    }
+  }
+
   [EarlGrey rotateDeviceToOrientation:UIDeviceOrientationPortrait error:nil];
 }
 
@@ -55,6 +63,13 @@ - (void)openTestViewNamed:(NSString *)name {
 }
 
 - (void)tearDown {
+  for (UIScene* scene in UIApplication.sharedApplication.connectedScenes) {
+    UIWindowScene* windowScene = (UIWindowScene*)scene;
+    for (UIWindow* window in windowScene.windows) {
+      [[window layer] setSpeed:1];
+    }
+  }
+
   [[GREYHostApplicationDistantObject sharedInstance] resetNavigationStack];
   [[GREYConfiguration sharedConfiguration] reset];
 
diff --git a/Tests/Functional/Sources/PresentedViewTest.m b/Tests/Functional/Sources/PresentedViewTest.m
index f5726e871..37c092998 100644
--- a/Tests/Functional/Sources/PresentedViewTest.m
+++ b/Tests/Functional/Sources/PresentedViewTest.m
@@ -29,6 +29,7 @@ - (void)setUp {
 }
 
 - (void)testDismissToResetNavController {
+  [[EarlGrey selectElementWithMatcher:GREYText(@"Modal View")] assertWithMatcher:GREYNotNil()];
   AppDelegate *app =
       (AppDelegate *)[GREY_REMOTE_CLASS_IN_APP(UIApplication) sharedApplication].delegate;
   [app resetRootNavigationController];
diff --git a/Tests/TestRig/Sources/MainViewController.m b/Tests/TestRig/Sources/MainViewController.m
index ea05b4efc..b345a8b54 100644
--- a/Tests/TestRig/Sources/MainViewController.m
+++ b/Tests/TestRig/Sources/MainViewController.m
@@ -145,7 +145,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                      animated:YES
                    completion:nil];
   } else if ([key isEqualToString:@"Presented Views"]) {
-    [self.navigationController presentViewController:vc animated:NO completion:nil];
+    [self.navigationController presentViewController:vc animated:YES completion:nil];
   } else {
     [UIView transitionWithView:self.navigationController.view
                       duration:0.2