Updated UITests

TheCodeTraveler · Jul 31, 2019 · 2ec750b · 2ec750b
1 parent f18c3b3
commit 2ec750b
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Src/HackerNews.UITests/Pages/NewsPage.cs b/Src/HackerNews.UITests/Pages/NewsPage.cs
@@ -22,8 +22,7 @@ public bool IsRefreshActivityIndicatorDisplayed
                 switch (App)
                 {
                     case AndroidApp androidApp:
-                        return (bool)App.Query(x => x.Class("SwipeRefreshLayout").Invoke("isRefreshing")).FirstOrDefault();
-
+                        return (bool)(App.Query(x => x.Class("SwipeRefreshLayout").Invoke("isRefreshing")).FirstOrDefault() ?? false);
                     case iOSApp iosApp:
                         return App.Query(x => x.Class("UIRefreshControl")).Any();
 
@@ -33,6 +32,13 @@ public bool IsRefreshActivityIndicatorDisplayed
             }
         }
 
+        public override void WaitForPageToLoad()
+        {
+            base.WaitForPageToLoad();
+
+            WaitForNoActivityIndicator();
+        }
+
         public void WaitForNoActivityIndicator(int timeoutInSeconds = 25)
         {
             int counter = 0;
@@ -46,13 +52,6 @@ public void WaitForNoActivityIndicator(int timeoutInSeconds = 25)
             }
         }
 
-        public override void WaitForPageToLoad()
-        {
-            base.WaitForPageToLoad();
-
-            WaitForNoActivityIndicator();
-        }
-
         public List<StoryModel> GetStoryList()
         {
             string storyListAsBase64String;