From f557bad5a3a2ef48b9751bcad231196f2a34a250 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Tue, 6 Mar 2018 16:35:26 -0500 Subject: [PATCH] Wait for MathJax for tests, rather than MathJax.isReady --- common/djangoapps/terrain/ui_helpers.py | 2 +- common/lib/xmodule/xmodule/js/src/video/10_main.js | 2 +- common/test/acceptance/pages/lms/video/video.py | 3 +-- common/test/acceptance/pages/studio/video/video.py | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/djangoapps/terrain/ui_helpers.py b/common/djangoapps/terrain/ui_helpers.py index a5ed62268f..2b92fbd00d 100644 --- a/common/djangoapps/terrain/ui_helpers.py +++ b/common/djangoapps/terrain/ui_helpers.py @@ -133,7 +133,7 @@ def wait_for_xmodule(): @world.absorb def wait_for_mathjax(): "Wait until MathJax is loaded and set up on the page." - world.wait_for_js_variable_truthy("MathJax.isReady") + world.wait_for_js_variable_truthy("MathJax") class RequireJSError(Exception): diff --git a/common/lib/xmodule/xmodule/js/src/video/10_main.js b/common/lib/xmodule/xmodule/js/src/video/10_main.js index 822a7ace77..cf79ec9aaf 100644 --- a/common/lib/xmodule/xmodule/js/src/video/10_main.js +++ b/common/lib/xmodule/xmodule/js/src/video/10_main.js @@ -36,7 +36,7 @@ // Main module. require( - /* End RequireJS */ +/* End RequireJS */ /* Webpack define( /* End Webpack */ diff --git a/common/test/acceptance/pages/lms/video/video.py b/common/test/acceptance/pages/lms/video/video.py index c3249cb7e0..033d3cc0eb 100644 --- a/common/test/acceptance/pages/lms/video/video.py +++ b/common/test/acceptance/pages/lms/video/video.py @@ -68,8 +68,7 @@ VIDEO_MENUS = { } -@js_defined('window.Video', 'window.RequireJS.require', 'window.jQuery', - 'window.MathJax', 'window.MathJax.isReady') +@js_defined('window.Video', 'window.jQuery', 'window.MathJax') class VideoPage(PageObject): """ Video player in the courseware. diff --git a/common/test/acceptance/pages/studio/video/video.py b/common/test/acceptance/pages/studio/video/video.py index 58abc54c85..c2caadca3c 100644 --- a/common/test/acceptance/pages/studio/video/video.py +++ b/common/test/acceptance/pages/studio/video/video.py @@ -91,8 +91,8 @@ FIELDS_WO_CLEAR = [ DELAY = 0.5 -@js_defined('window.Video', 'window.RequireJS.require', 'window.jQuery', 'window.XModule', 'window.XBlock', - 'window.MathJax', 'window.MathJax.isReady') +@js_defined('window.Video', 'window.jQuery', 'window.XModule', 'window.XBlock', + 'window.MathJax') class VideoComponentPage(VideoPage): """ CMS Video Component Page