From 6fc490e3d4f0718f940c0423d69685bd43dc4f4d Mon Sep 17 00:00:00 2001
From: Jesse Zoldak <zoldak@edx.org>
Date: Fri, 15 Jan 2016 16:35:15 -0500
Subject: [PATCH] Harden page objects

---
 .../test/acceptance/pages/lms/learner_profile.py  |  5 ++++-
 common/test/acceptance/pages/studio/overview.py   |  6 +++++-
 .../pages/studio/settings_group_configurations.py | 15 ++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/test/acceptance/pages/lms/learner_profile.py b/common/test/acceptance/pages/lms/learner_profile.py
index dec050f022..848a1f4759 100644
--- a/common/test/acceptance/pages/lms/learner_profile.py
+++ b/common/test/acceptance/pages/lms/learner_profile.py
@@ -43,7 +43,10 @@ class LearnerProfilePage(FieldsMixin, PageObject):
         """
         Check if browser is showing correct page.
         """
-        return self.q(css='body.view-profile .account-settings-container').present
+        return all([
+            self.q(css='body.view-profile .account-settings-container').present,
+            not self.q(css='ui-loading-indicator').visible
+        ])
 
     @property
     def privacy(self):
diff --git a/common/test/acceptance/pages/studio/overview.py b/common/test/acceptance/pages/studio/overview.py
index 2eba3d0e06..aabe0f3014 100644
--- a/common/test/acceptance/pages/studio/overview.py
+++ b/common/test/acceptance/pages/studio/overview.py
@@ -454,7 +454,11 @@ class CourseOutlinePage(CoursePage, CourseOutlineContainer):
     BOTTOM_ADD_SECTION_BUTTON = '.outline > .add-section .button-new'
 
     def is_browser_on_page(self):
-        return self.q(css='body.view-outline').present and self.q(css='div.ui-loading.is-hidden').present
+        return all([
+            self.q(css='body.view-outline').present,
+            self.q(css='.content-primary').present,
+            self.q(css='div.ui-loading.is-hidden').present
+        ])
 
     def view_live(self):
         """
diff --git a/common/test/acceptance/pages/studio/settings_group_configurations.py b/common/test/acceptance/pages/studio/settings_group_configurations.py
index 7a77db5e68..4fad4ef288 100644
--- a/common/test/acceptance/pages/studio/settings_group_configurations.py
+++ b/common/test/acceptance/pages/studio/settings_group_configurations.py
@@ -19,17 +19,10 @@ class GroupConfigurationsPage(CoursePage):
         """
         Verify that the browser is on the page and it is not still loading.
         """
-        EmptyPromise(
-            lambda: self.q(css='body.view-group-configurations').present,
-            'On the group configuration page'
-        ).fulfill()
-
-        EmptyPromise(
-            lambda: not self.q(css='span.spin').visible,
-            'Group Configurations are finished loading'
-        ).fulfill()
-
-        return True
+        return all([
+            self.q(css='body.view-group-configurations').present,
+            self.q(css='div.ui-loading.is-hidden').present
+        ])
 
     @property
     def experiment_group_configurations(self):