Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMaurĂ­cio Meneghini Fauth <mauricio@fauth.dev>2022-06-22 01:45:42 +0300
committerGitHub <noreply@github.com>2022-06-22 01:45:42 +0300
commit3b99d77d5e281081bc793568f00dc75ba34f8562 (patch)
treebc693f324823c17b548cfc864c29ce5751078d61 /test
parentda7c7a84e194f4f964bd65fea5f7a0931caae033 (diff)
parent9ff5655f6e212cef6f006487f158244410c309fb (diff)
Merge pull request #17614 from MauricioFauth/js-ajax-global
Assign `AJAX` to the `window` global object
Diffstat (limited to 'test')
-rw-r--r--test/classes/ScriptsTest.php2
-rw-r--r--test/selenium/TestBase.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index 30ad0a4578..37f5e838af 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -52,7 +52,7 @@ class ScriptsTest extends AbstractTestCase
$actual
);
$this->assertStringContainsString('.add(\'common.js\', 1)', $actual);
- $this->assertStringContainsString('AJAX.fireOnload(\'common.js\')', $actual);
+ $this->assertStringContainsString('window.AJAX.fireOnload(\'common.js\')', $actual);
}
/**
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index f1d94b304e..3689609224 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -1073,7 +1073,7 @@ JS;
$this->webDriver->executeAsyncScript(
'var callback = arguments[arguments.length - 1];'
. 'function startWaitingForAjax() {'
- . ' if (! AJAX.active) {'
+ . ' if (! window.AJAX.active) {'
. ' callback();'
. ' } else {'
. ' setTimeout(startWaitingForAjax, 200);'