From 7b5fa603ddf27eee517bf3978c1fc0ca20719a7d Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Thu, 12 Nov 2020 08:17:34 +0800 Subject: [PATCH] MDL-67668 behat: Correct js pending check Pending checks should only run when JS is running, but some uses were not apply this check. --- lib/behat/behat_base.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/behat/behat_base.php b/lib/behat/behat_base.php index f4ef183a558..a148a9c23fc 100644 --- a/lib/behat/behat_base.php +++ b/lib/behat/behat_base.php @@ -848,11 +848,6 @@ EOF; * @return bool Whether any JS is still pending completion. */ public function wait_for_pending_js() { - if (!$this->running_javascript()) { - // JS is not available therefore there is nothing to wait for. - return false; - } - return static::wait_for_pending_js_in_session($this->getSession()); } @@ -863,6 +858,11 @@ EOF; * @return bool Whether any JS is still pending completion. */ public static function wait_for_pending_js_in_session(Session $session) { + if (!self::running_javascript_in_session($session)) { + // JS is not available therefore there is nothing to wait for. + return false; + } + // We don't use behat_base::spin() here as we don't want to end up with an exception // if the page & JSs don't finish loading properly. for ($i = 0; $i < self::get_extended_timeout() * 10; $i++) {