diff options
author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-02 23:24:35 +0300 |
---|---|---|
committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-04 01:08:27 +0300 |
commit | 2a4c58258bad70f031e7b01f4e0248c45058875b (patch) | |
tree | 16f6cbac8618a10e800e5b420ce5c688aadc1690 /test | |
parent | 0056236a4c52caa4f9a9013aa4786381c3b8077c (diff) |
Use JS module to import jQuery
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'test')
-rw-r--r-- | test/javascript/sql.test.js | 4 | ||||
-rw-r--r-- | test/jest/file-transformer.js | 17 | ||||
-rw-r--r-- | test/jest/test-env.js | 8 |
3 files changed, 3 insertions, 26 deletions
diff --git a/test/javascript/sql.test.js b/test/javascript/sql.test.js index e2b333329d..0fb6b29654 100644 --- a/test/javascript/sql.test.js +++ b/test/javascript/sql.test.js @@ -1,6 +1,8 @@ /* eslint-env node, jest */ +/* global Sql */ -const Sql = require('phpmyadmin/sql'); +import 'phpmyadmin/ajax'; +import 'phpmyadmin/sql'; describe('SQL', () => { test('test URL encode', () => { diff --git a/test/jest/file-transformer.js b/test/jest/file-transformer.js deleted file mode 100644 index 81ea49b9a1..0000000000 --- a/test/jest/file-transformer.js +++ /dev/null @@ -1,17 +0,0 @@ -/* eslint-env node */ - -module.exports = { - process (sourceContents, filename) { - // The file is a source file and can contain @test-module annotations - if (filename.indexOf('js/src') !== -1) { - if (sourceContents.includes('@test-module')) { - // Annotation detected, add some code to the source file - const moduleName = sourceContents.match(/@test-module (.*)/)[1]; - // eslint-disable-next-line no-param-reassign - sourceContents += '\r\nmodule.exports = ' + moduleName + ';\r\n'; - } - return sourceContents; - } - return sourceContents; - }, -}; diff --git a/test/jest/test-env.js b/test/jest/test-env.js deleted file mode 100644 index 3276c5fa93..0000000000 --- a/test/jest/test-env.js +++ /dev/null @@ -1,8 +0,0 @@ -/* eslint-env node */ - -const $ = require('jquery'); -global.$ = $; -global.jQuery = $; -global.CommonParams = require('phpmyadmin/common'); -global.AJAX = require('phpmyadmin/ajax'); -global.Functions = require('phpmyadmin/functions'); |