Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Internal #2053

Open
wants to merge 1 commit into
base: earlgrey2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Tests/Functional/Sources/BaseIntegrationTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

Expand All @@ -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];

Expand Down
1 change: 1 addition & 0 deletions Tests/Functional/Sources/PresentedViewTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestRig/Sources/MainViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down