From d53372d2e434ffed950ea9d154b38868d4f19235 Mon Sep 17 00:00:00 2001
From: steven <stevdev@web.de>
Date: Fri, 21 Sep 2018 11:12:51 +0200
Subject: [PATCH] Adds untracking for state kGREYPendingViewsToDisappear if a
 UIViewController's viewDidAppear has been called. This is neccessary if the
 user triggers a transition between UIViewControllers e.g. in the context of a
 UIPageViewController. See this example for an explanation:

We show a UIPageViewController with three UIViewControllers <VC1>, <VC2>, and <VC3>.
This is the series of events:

* <VC1>.viewWillAppear
* <VC1>.viewDidAppear
* <VC1>.view is shown to the user
* User performs swipe left
* <VC2>.viewWillAppear
* <VC1>.viewWillDisappear
* <VC2>.viewDidAppear
* <VC1>.viewDidDisappear
* <VC2>.view is shown to the user
* User performs swipe left (This swipe does not go far enough to show <VC3>.view at the end of the swipe)
* <VC3>.viewWillAppear
* <VC2>.viewWillDisappear
* <VC2>.viewWillAppear
* <VC2>.viewDidAppear
* <VC3>.viewWillDisappear
* <VC3>.viewDidDisappear
* <VC2>.view is shown to the user again

Without this patch, EarlGrey waits for viewDidDisappear: call on <VC2> and app state does not become kGREYIdle.
With this patch, at the call of <VC2>.viewDidAppear state kGREYPendingViewsToDisappear is untracked and app state becomes kGREYIdle.
---
 EarlGrey/Additions/UIViewController+GREYAdditions.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EarlGrey/Additions/UIViewController+GREYAdditions.m b/EarlGrey/Additions/UIViewController+GREYAdditions.m
index 1770ebe4c..7bcc655a7 100644
--- a/EarlGrey/Additions/UIViewController+GREYAdditions.m
+++ b/EarlGrey/Additions/UIViewController+GREYAdditions.m
@@ -166,7 +166,7 @@ - (void)greyswizzled_viewWillAppear:(BOOL)animated {
 - (void)greyswizzled_viewDidAppear:(BOOL)animated {
   GREYAppStateTrackerObject *object =
       objc_getAssociatedObject(self, @selector(greyswizzled_viewWillAppear:));
-  GREYAppState state = kGREYPendingViewsToAppear | kGREYPendingRootViewControllerToAppear;
+  GREYAppState state = kGREYPendingViewsToAppear | kGREYPendingRootViewControllerToAppear | kGREYPendingViewsToDisappear;
   UNTRACK_STATE_FOR_OBJECT(state, object);
 
   [self grey_setAppeared:YES];