Move waits into the page objects.

common/test/acceptance/pages/lms/discussion.py

@@ -116,11 +116,19 @@ class DiscussionThreadPage(PageObject, DiscussionPageMixin):
     def is_discussion_body_visible(self):
         return self._is_element_visible(".post-body")
 
-    def is_mathjax_preview_available(self):
-        return self.q(css=".MathJax_Preview").text[0] == ""
+    def verify_mathjax_preview_available(self):
+        """ Checks that MathJax Preview css class is present """
+        self.wait_for(
+            lambda: len(self.q(css=".MathJax_Preview").text) > 0 and self.q(css=".MathJax_Preview").text[0] == "",
+            description="MathJax Preview is rendered"
+        )
 
-    def is_mathjax_rendered(self):
-        return self._is_element_visible(".MathJax")
+    def verify_mathjax_rendered(self):
+        """ Checks that MathJax css class is present """
+        self.wait_for(
+            lambda: self._is_element_visible(".MathJax"),
+            description="MathJax Preview is rendered"
+        )
 
     def is_response_visible(self, comment_id):
         """Returns true if the response is viewable onscreen"""

common/test/acceptance/pages/lms/problem.py

@@ -42,21 +42,33 @@ class ProblemPage(PageObject):
         """
         return self.q(css="div.problem div.problem-hint").text[0]
 
-    @property
-    def mathjax_rendered_in_problem(self):
+    def verify_mathjax_rendered_in_problem(self):
         """
         Check that MathJax have been rendered in problem hint
         """
-        mathjax_container = self.q(css="div.problem p .MathJax .math")
-        return mathjax_container.visible and mathjax_container.present
+        def mathjax_present():
+            """ Returns True if MathJax css is present in the problem body """
+            mathjax_container = self.q(css="div.problem p .MathJax .math")
+            return mathjax_container.visible and mathjax_container.present
 
-    @property
-    def mathjax_rendered_in_hint(self):
+        self.wait_for(
+            mathjax_present,
+            description="MathJax rendered in problem body"
+        )
+
+    def verify_mathjax_rendered_in_hint(self):
         """
         Check that MathJax have been rendered in problem hint
         """
-        mathjax_container = self.q(css="div.problem div.problem-hint .MathJax .math")
-        return mathjax_container.visible and mathjax_container.present
+        def mathjax_present():
+            """ Returns True if MathJax css is present in the problem body """
+            mathjax_container = self.q(css="div.problem div.problem-hint .MathJax .math")
+            return mathjax_container.visible and mathjax_container.present
+
+        self.wait_for(
+            mathjax_present,
+            description="MathJax rendered in hint"
+        )
 
     def fill_answer(self, text):
         """

common/test/acceptance/tests/discussion/test_discussion.py

@@ -231,14 +231,8 @@ class DiscussionTabSingleThreadTest(BaseDiscussionTestCase, DiscussionResponsePa
         thread_fixture.push()
         self.setup_thread_page(thread_id)
         self.assertTrue(self.thread_page.is_discussion_body_visible())
-        self.thread_page.wait_for(
-            self.thread_page.is_mathjax_preview_available,
-            description="MathJax Preview is rendered"
-        )
-        self.thread_page.wait_for(
-            self.thread_page.is_mathjax_rendered,
-            description="MathJax is rendered"
-        )
+        self.thread_page.verify_mathjax_preview_available()
+        self.thread_page.verify_mathjax_rendered()
 
     def test_markdown_reference_link(self):
         """

common/test/acceptance/tests/lms/test_lms_problems.py

@@ -275,28 +275,18 @@ class ProblemWithMathjax(ProblemsTest):
         problem_page = ProblemPage(self.browser)
         self.assertEqual(problem_page.problem_name, "MATHJAX TEST PROBLEM")
 
-        # Verify MathJax has been rendered
-        problem_page.wait_for(
-            lambda: problem_page.mathjax_rendered_in_problem,
-            description="MathJax rendered in body"
-        )
+        problem_page.verify_mathjax_rendered_in_problem()
 
         # The hint button rotates through multiple hints
         problem_page.click_hint()
         self.assertIn("Hint (1 of 2): mathjax should work1", problem_page.hint_text)
-        problem_page.wait_for(
-            lambda: problem_page.mathjax_rendered_in_hint,
-            description="MathJax rendered in hint"
-        )
+        problem_page.verify_mathjax_rendered_in_hint()
 
         # Rotate the hint and check the problem hint
         problem_page.click_hint()
 
         self.assertIn("Hint (2 of 2): mathjax should work2", problem_page.hint_text)
-        problem_page.wait_for(
-            lambda: problem_page.mathjax_rendered_in_hint,
-            description="MathJax rendered in hint"
-        )
+        problem_page.verify_mathjax_rendered_in_hint()
 
 
 class ProblemPartialCredit(ProblemsTest):