Fix access to Cordova's define & require in tests
diff --git a/test/.eslintrc.yml b/test/.eslintrc.yml
index 6afba65..45b3991 100644
--- a/test/.eslintrc.yml
+++ b/test/.eslintrc.yml
@@ -1,2 +1,5 @@
env:
- jasmine: true
\ No newline at end of file
+ jasmine: true
+
+globals:
+ cordova: false
diff --git a/test/android/test.exec.js b/test/android/test.exec.js
index 979c7c9..0a5ba60 100644
--- a/test/android/test.exec.js
+++ b/test/android/test.exec.js
@@ -20,9 +20,8 @@
*/
describe('android exec.processMessages', function () {
- var cordova = require('cordova');
- var exec = require('cordova/android/exec');
- var nativeApiProvider = require('cordova/android/nativeapiprovider');
+ var exec = cordova.require('cordova/android/exec');
+ var nativeApiProvider = cordova.require('cordova/android/nativeapiprovider');
var origNativeApi = nativeApiProvider.get();
var nativeApi = {
diff --git a/test/ios/test.exec.js b/test/ios/test.exec.js
index 8e654aa..e310c21 100644
--- a/test/ios/test.exec.js
+++ b/test/ios/test.exec.js
@@ -20,7 +20,7 @@
*/
describe('iOS exec', function () {
- var exec = require('cordova/ios/exec');
+ var exec = cordova.require('cordova/ios/exec');
var winSpy = jasmine.createSpy('win');
var failSpy = jasmine.createSpy('fail');
var origUserAgent = navigator.userAgent;
diff --git a/test/test.argscheck.js b/test/test.argscheck.js
index 4092c34..7f4392c 100644
--- a/test/test.argscheck.js
+++ b/test/test.argscheck.js
@@ -20,7 +20,7 @@
*/
describe('argscheck', function () {
- var argscheck = require('cordova/argscheck');
+ var argscheck = cordova.require('cordova/argscheck');
function createTestFunc (allowNull) {
return function testFunc (num, obj, arr, str, date, func) {
diff --git a/test/test.base64.js b/test/test.base64.js
index 1f33460..41b92ad 100644
--- a/test/test.base64.js
+++ b/test/test.base64.js
@@ -20,7 +20,7 @@
*/
describe('base64', function () {
- var base64 = require('cordova/base64');
+ var base64 = cordova.require('cordova/base64');
it('Test#001 : can base64 encode strings correctly', function () {
var arrayBuffer = new ArrayBuffer(6);
diff --git a/test/test.builder.js b/test/test.builder.js
index 174ed61..fbbe1f7 100644
--- a/test/test.builder.js
+++ b/test/test.builder.js
@@ -21,7 +21,7 @@
describe('builder', function () {
- var builder = require('cordova/builder');
+ var builder = cordova.require('cordova/builder');
it('Test#001 : includes the module into the target', function () {
@@ -34,7 +34,7 @@
builder.buildIntoAndClobber(objects, target);
expect(target.foo).toBeDefined();
- expect(target.foo).toBe(require('cordova/builder'));
+ expect(target.foo).toBe(cordova.require('cordova/builder'));
});
it('Test#002 : returns an empty object literal if no path', function () {
@@ -64,7 +64,7 @@
builder.buildIntoButDoNotClobber(objects, target);
expect(target.homer.bart).toBeDefined();
- expect(target.homer.maggie).toBe(require('cordova/builder'));
+ expect(target.homer.maggie).toBe(cordova.require('cordova/builder'));
expect(target.homer.lisa).toBeDefined();
});
});
diff --git a/test/test.channel.js b/test/test.channel.js
index 1582b05..15e2a3f 100644
--- a/test/test.channel.js
+++ b/test/test.channel.js
@@ -20,7 +20,7 @@
*/
describe('channel', function () {
- var channel = require('cordova/channel');
+ var channel = cordova.require('cordova/channel');
var multiChannel;
var stickyChannel;
diff --git a/test/test.modulemapper.js b/test/test.modulemapper.js
index b862a97..1b9c875 100644
--- a/test/test.modulemapper.js
+++ b/test/test.modulemapper.js
@@ -19,9 +19,9 @@
*/
describe('modulemapper', function () {
- var modulemapper = require('cordova/modulemapper');
- var testmodule = require('cordova/test/testmodule');
- var utils = require('cordova/utils');
+ var modulemapper = cordova.require('cordova/modulemapper');
+ var testmodule = cordova.require('cordova/test/testmodule');
+ var utils = cordova.require('cordova/utils');
var context;
beforeEach(function () {
diff --git a/test/test.pluginloader.js b/test/test.pluginloader.js
index c971825..5b569f6 100644
--- a/test/test.pluginloader.js
+++ b/test/test.pluginloader.js
@@ -20,7 +20,8 @@
*/
describe('pluginloader', function () {
- var pluginloader = require('cordova/pluginloader');
+ const { define } = cordova;
+ var pluginloader = cordova.require('cordova/pluginloader');
var injectScript;
var cdvScript;
beforeEach(function () {
@@ -36,10 +37,8 @@
cdvScript.parentNode.removeChild(cdvScript);
cdvScript = null;
}
- /* eslint-disable no-undef */
define.remove('cordova/plugin_list');
define.remove('some.id');
- /* eslint-enable no-undef */
});
it('Test#001 : should inject cordova_plugins.js when it is not already there', function (done) {
diff --git a/test/test.require.js b/test/test.require.js
index 18f4831..56bf685 100644
--- a/test/test.require.js
+++ b/test/test.require.js
@@ -18,12 +18,13 @@
* under the License.
*
*/
-/* eslint-disable no-undef */
+
describe('require + define', function () {
+ const { require, define } = cordova;
+
it('exists off of cordova', function () {
- var cordova = require('cordova');
- expect(cordova.require).toBeDefined();
- expect(cordova.define).toBeDefined();
+ expect(require).toBeDefined();
+ expect(define).toBeDefined();
});
describe('when defining', function () {
diff --git a/test/test.urlutil.js b/test/test.urlutil.js
index 6b245b1..6dae288 100644
--- a/test/test.urlutil.js
+++ b/test/test.urlutil.js
@@ -20,7 +20,7 @@
*/
describe('urlutil', function () {
- var urlutil = require('cordova/urlutil');
+ var urlutil = cordova.require('cordova/urlutil');
if (typeof process !== 'undefined') {
// Tests don't work under jsdom.
return;
diff --git a/test/test.utils.js b/test/test.utils.js
index 68c7ec0..d1327e1 100644
--- a/test/test.utils.js
+++ b/test/test.utils.js
@@ -20,7 +20,7 @@
*/
describe('utils', function () {
- var utils = require('cordova/utils');
+ var utils = cordova.require('cordova/utils');
describe('utils.arrayIndexOf', function () {
it('Test#001 : should return -1 when not found', function () {
