Repository: cordova-js Updated Branches: refs/heads/master 74a4adc2d -> c75e80591
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/android/test.exec.js ---------------------------------------------------------------------- diff --git a/test/android/test.exec.js b/test/android/test.exec.js index a8e0b24..0f0cd9e 100644 --- a/test/android/test.exec.js +++ b/test/android/test.exec.js @@ -20,35 +20,36 @@ */ describe('android exec.processMessages', function () { - var cordova = require('cordova'), - exec = require('cordova/android/exec'), - nativeApiProvider = require('cordova/android/nativeapiprovider'), - origNativeApi = nativeApiProvider.get(); + var cordova = require('cordova'); + var exec = require('cordova/android/exec'); + var nativeApiProvider = require('cordova/android/nativeapiprovider'); + var origNativeApi = nativeApiProvider.get(); var nativeApi = { exec: jasmine.createSpy('nativeApi.exec'), - retrieveJsMessages: jasmine.createSpy('nativeApi.retrieveJsMessages'), + retrieveJsMessages: jasmine.createSpy('nativeApi.retrieveJsMessages') }; - - beforeEach(function() { + beforeEach(function () { nativeApi.exec.reset(); nativeApi.retrieveJsMessages.reset(); // Avoid a log message warning about the lack of _nativeApi. exec.setJsToNativeBridgeMode(exec.jsToNativeModes.PROMPT); nativeApiProvider.set(nativeApi); - var origPrompt = typeof prompt == 'undefined' ? undefined : prompt; - prompt = function() { return 1234; }; + /* eslint-disable no-undef */ + var origPrompt = typeof prompt === 'undefined' ? undefined : prompt; + prompt = function () { return 1234; }; exec.init(); prompt = origPrompt; + /* eslint-enable no-undef */ }); - afterEach(function() { + afterEach(function () { nativeApiProvider.set(origNativeApi); cordova.callbacks = {}; }); - function createCallbackMessage(success, keepCallback, status, callbackId, encodedPayload) { + function createCallbackMessage (success, keepCallback, status, callbackId, encodedPayload) { var ret = ''; ret += success ? 'S' : 'F'; ret += keepCallback ? '1' : '0'; @@ -59,18 +60,18 @@ describe('android exec.processMessages', function () { return ret; } - describe('exec', function() { - it('should process messages in order even when called recursively', function() { + describe('exec', function () { + it('should process messages in order even when called recursively', function () { var firstCallbackId = null; var callCount = 0; - nativeApi.exec.andCallFake(function(secret, service, action, callbackId, argsJson) { + nativeApi.exec.andCallFake(function (secret, service, action, callbackId, argsJson) { expect(secret).toBe(1234); ++callCount; - if (callCount == 1) { + if (callCount === 1) { firstCallbackId = callbackId; return ''; } - if (callCount == 2) { + if (callCount === 2) { return createCallbackMessage(true, false, 1, firstCallbackId, 't') + createCallbackMessage(true, false, 1, callbackId, 'stwo'); } @@ -80,13 +81,13 @@ describe('android exec.processMessages', function () { var win2Called = false; var winSpy3 = jasmine.createSpy('win3'); - function win1(value) { + function win1 (value) { expect(value).toBe(true); exec(winSpy3, null, 'Service', 'action', []); expect(win2Called).toBe(false, 'win1 should finish before win2 starts'); } - function win2(value) { + function win2 (value) { win2Called = true; expect(value).toBe('two'); expect(winSpy3).not.toHaveBeenCalled(); @@ -94,13 +95,13 @@ describe('android exec.processMessages', function () { exec(win1, null, 'Service', 'action', []); exec(win2, null, 'Service', 'action', []); - waitsFor(function() { return winSpy3.wasCalled }, 200); - runs(function() { + waitsFor(function () { return winSpy3.wasCalled; }, 200); + runs(function () { expect(winSpy3).toHaveBeenCalledWith('three'); }); }); - it('should process messages asynchronously', function() { - nativeApi.exec.andCallFake(function(secret, service, action, callbackId, argsJson) { + it('should process messages asynchronously', function () { + nativeApi.exec.andCallFake(function (secret, service, action, callbackId, argsJson) { expect(secret).toBe(1234); return createCallbackMessage(true, false, 1, callbackId, 'stwo'); }); @@ -109,138 +110,138 @@ describe('android exec.processMessages', function () { exec(winSpy, null, 'Service', 'action', []); expect(winSpy).not.toHaveBeenCalled(); - waitsFor(function() { return winSpy.wasCalled }, 200); + waitsFor(function () { return winSpy.wasCalled; }, 200); }); }); - describe('processMessages', function() { - var origCallbackFromNative = cordova.callbackFromNative, - callbackSpy = jasmine.createSpy('callbackFromNative'); + describe('processMessages', function () { + var origCallbackFromNative = cordova.callbackFromNative; + var callbackSpy = jasmine.createSpy('callbackFromNative'); - beforeEach(function() { + beforeEach(function () { callbackSpy.reset(); cordova.callbackFromNative = callbackSpy; }); - afterEach(function() { + afterEach(function () { cordova.callbackFromNative = origCallbackFromNative; }); - function performExecAndReturn(messages) { + function performExecAndReturn (messages) { - nativeApi.exec.andCallFake(function(secret, service, action, callbackId, argsJson) { + nativeApi.exec.andCallFake(function (secret, service, action, callbackId, argsJson) { return messages; }); exec(null, null, 'Service', 'action', []); // note: sometimes we need to wait for multiple callbacks, this returns after one // see 'should handle multiple messages' below - waitsFor(function() { return callbackSpy.wasCalled }, 200); + waitsFor(function () { return callbackSpy.wasCalled; }, 200); } - it('should handle payloads of false', function() { + it('should handle payloads of false', function () { var messages = createCallbackMessage(true, true, 1, 'id', 'f'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [false], true); }); }); - it('should handle payloads of true', function() { + it('should handle payloads of true', function () { var messages = createCallbackMessage(true, true, 1, 'id', 't'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [true], true); }); }); - it('should handle payloads of null', function() { + it('should handle payloads of null', function () { var messages = createCallbackMessage(true, true, 1, 'id', 'N'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [null], true); }); }); - it('should handle payloads of numbers', function() { + it('should handle payloads of numbers', function () { var messages = createCallbackMessage(true, true, 1, 'id', 'n-3.3'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [-3.3], true); }); }); - it('should handle payloads of strings', function() { + it('should handle payloads of strings', function () { var messages = createCallbackMessage(true, true, 1, 'id', 'sHello world'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, ['Hello world'], true); }); }); - it('should handle payloads of JSON objects', function() { + it('should handle payloads of JSON objects', function () { var messages = createCallbackMessage(true, true, 1, 'id', '{"a":1}'); performExecAndReturn(messages); - runs(function() { - expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [{a:1}], true); + runs(function () { + expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [{a: 1}], true); }); }); - it('should handle payloads of JSON arrays', function() { + it('should handle payloads of JSON arrays', function () { var messages = createCallbackMessage(true, true, 1, 'id', '[1]'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [[1]], true); }); }); - it('should handle other callback opts', function() { + it('should handle other callback opts', function () { var messages = createCallbackMessage(false, false, 3, 'id', 'sfoo'); performExecAndReturn(messages); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', false, 3, ['foo'], false); }); }); - it('should handle multiple messages', function() { + it('should handle multiple messages', function () { var message1 = createCallbackMessage(false, false, 3, 'id', 'sfoo'); var message2 = createCallbackMessage(true, true, 1, 'id', 'f'); var messages = message1 + message2; performExecAndReturn(messages); // need to wait for ALL the callbacks before we check our expects - waitsFor(function(){ + waitsFor(function () { return callbackSpy.calls.length > 1; - },200); + }, 200); - runs(function() { + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', false, 3, ['foo'], false); expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [false], true); }); }); - it('should poll for more messages when hitting an *', function() { + it('should poll for more messages when hitting an *', function () { var message1 = createCallbackMessage(false, false, 3, 'id', 'sfoo'); var message2 = createCallbackMessage(true, true, 1, 'id', 'f'); - nativeApi.retrieveJsMessages.andCallFake(function() { + nativeApi.retrieveJsMessages.andCallFake(function () { expect(callbackSpy).toHaveBeenCalledWith('id', false, 3, ['foo'], false); callbackSpy.reset(); return message2; }); performExecAndReturn(message1 + '*'); - waitsFor(function() { return nativeApi.retrieveJsMessages.wasCalled }, 500); - runs(function() { + waitsFor(function () { return nativeApi.retrieveJsMessages.wasCalled; }, 500); + runs(function () { expect(callbackSpy).toHaveBeenCalledWith('id', true, 1, [false], true); }); }); - it('should call callbacks in order when one callback enqueues another.', function() { + it('should call callbacks in order when one callback enqueues another.', function () { var message1 = createCallbackMessage(false, false, 3, 'id', 'scall1'); var message2 = createCallbackMessage(false, false, 3, 'id', 'scall2'); var message3 = createCallbackMessage(false, false, 3, 'id', 'scall3'); - callbackSpy.andCallFake(function() { - if (callbackSpy.calls.length == 1) { + callbackSpy.andCallFake(function () { + if (callbackSpy.calls.length === 1) { performExecAndReturn(message3); } }); performExecAndReturn(message1 + message2); // need to wait for ALL the callbacks before we check our expects - waitsFor(function(){ + waitsFor(function () { return callbackSpy.calls.length > 2; - },200); + }, 200); - runs(function() { + runs(function () { expect(callbackSpy.argsForCall.length).toEqual(3); expect(callbackSpy.argsForCall[0]).toEqual(['id', false, 3, ['call1'], false]); expect(callbackSpy.argsForCall[1]).toEqual(['id', false, 3, ['call2'], false]); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/ios/test.exec.js ---------------------------------------------------------------------- diff --git a/test/ios/test.exec.js b/test/ios/test.exec.js index 8006277..ac18d86 100644 --- a/test/ios/test.exec.js +++ b/test/ios/test.exec.js @@ -19,31 +19,26 @@ * */ -/*jshint jasmine:true*/ +/* jshint jasmine:true */ describe('iOS exec', function () { - var SERVICE = 'TestService'; - var ACTION = 'TestAction'; - var VC_ADDR = '1234'; - - var cordova = require('cordova'); var exec = require('cordova/ios/exec'); var winSpy = jasmine.createSpy('win'); var failSpy = jasmine.createSpy('fail'); var origUserAgent = navigator.userAgent; - beforeEach(function() { + beforeEach(function () { winSpy.reset(); failSpy.reset(); }); - afterEach(function() { - navigator.__defineGetter__('userAgent', function(){ + afterEach(function () { + navigator.__defineGetter__('userAgent', function () { return origUserAgent; }); }); - function simulateNativeBehaviour(codes) { + function simulateNativeBehaviour (codes) { // eslint-disable-line no-unused-vars var execPayload = JSON.parse(exec.nativeFetchMessages()); while (execPayload.length && codes.length) { var curPayload = execPayload.shift(); @@ -56,8 +51,8 @@ describe('iOS exec', function () { expect(codes.length).toBe(0, 'Wrong number of results.'); } - describe('exec', function() { - it('should return "" from nativeFetchMessages work when nothing is pending.', function() { + describe('exec', function () { + it('should return "" from nativeFetchMessages work when nothing is pending.', function () { var execPayload = exec.nativeFetchMessages(); expect(execPayload).toBe(''); }); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.argscheck.js ---------------------------------------------------------------------- diff --git a/test/test.argscheck.js b/test/test.argscheck.js index 10a4175..441bd38 100644 --- a/test/test.argscheck.js +++ b/test/test.argscheck.js @@ -19,61 +19,61 @@ * */ -describe('argscheck', function() { +describe('argscheck', function () { var argscheck = require('cordova/argscheck'); - function createTestFunc(allowNull) { - return function testFunc(num, obj, arr, str, date, func) { + function createTestFunc (allowNull) { + return function testFunc (num, obj, arr, str, date, func) { var spec = allowNull ? 'NOASDF*' : 'noasdf*'; argscheck.checkArgs(spec, 'testFunc', arguments); }; } - afterEach(function() { - argscheck.enableChecks = true; + afterEach(function () { + argscheck.enableChecks = true; }); - it('should not throw when given valid args', function() { + it('should not throw when given valid args', function () { var testFunc = createTestFunc(false); testFunc(0, {}, [], '', new Date(), testFunc, 1); }); - it('should not throw when given valid optional args', function() { + it('should not throw when given valid optional args', function () { var testFunc = createTestFunc(true); testFunc(0, {}, [], '', new Date(), testFunc, ''); }); - it('should not throw when given missing optional args', function() { + it('should not throw when given missing optional args', function () { var testFunc = createTestFunc(true); testFunc(); }); - it('should not throw when given null optional args', function() { + it('should not throw when given null optional args', function () { var testFunc = createTestFunc(true); testFunc(null, null, null, null, null, null, null); }); - it('should throw when given invalid number', function() { + it('should throw when given invalid number', function () { var testFunc = createTestFunc(true); - expect(function() { testFunc('foo', null, null, null, null, null) }).toThrow('Wrong type for parameter "num" of testFunc: Expected Number, but got String.'); + expect(function () { testFunc('foo', null, null, null, null, null); }).toThrow('Wrong type for parameter "num" of testFunc: Expected Number, but got String.'); }); - it('should throw when given invalid object', function() { + it('should throw when given invalid object', function () { var testFunc = createTestFunc(true); // Do not allow arrays for objects since we're usually dealing with JSON when expecting objects. - expect(function() { testFunc(null, [], null, null, null, null) }).toThrow('Wrong type for parameter "obj" of testFunc: Expected Object, but got Array.'); + expect(function () { testFunc(null, [], null, null, null, null); }).toThrow('Wrong type for parameter "obj" of testFunc: Expected Object, but got Array.'); }); - it('should throw when given invalid array', function() { + it('should throw when given invalid array', function () { var testFunc = createTestFunc(true); - expect(function() { testFunc(null, null, {}, null, null, null) }).toThrow('Wrong type for parameter "arr" of testFunc: Expected Array, but got Object.'); + expect(function () { testFunc(null, null, {}, null, null, null); }).toThrow('Wrong type for parameter "arr" of testFunc: Expected Array, but got Object.'); }); - it('should throw when given invalid string', function() { + it('should throw when given invalid string', function () { var testFunc = createTestFunc(true); - expect(function() { testFunc(null, null, null, 5, null, null) }).toThrow('Wrong type for parameter "str" of testFunc: Expected String, but got Number.'); + expect(function () { testFunc(null, null, null, 5, null, null); }).toThrow('Wrong type for parameter "str" of testFunc: Expected String, but got Number.'); }); - it('should throw when given invalid date', function() { + it('should throw when given invalid date', function () { var testFunc = createTestFunc(true); - expect(function() { testFunc(null, null, null, null, 233, null) }).toThrow('Wrong type for parameter "date" of testFunc: Expected Date, but got Number.'); + expect(function () { testFunc(null, null, null, null, 233, null); }).toThrow('Wrong type for parameter "date" of testFunc: Expected Date, but got Number.'); }); - it('should throw when given invalid function', function() { + it('should throw when given invalid function', function () { var testFunc = createTestFunc(true); - expect(function() { testFunc(null, null, null, null, null, new Date) }).toThrow('Wrong type for parameter "func" of testFunc: Expected Function, but got Date.'); + expect(function () { testFunc(null, null, null, null, null, new Date()); }).toThrow('Wrong type for parameter "func" of testFunc: Expected Function, but got Date.'); }); - it('should not throw when checking is disabled', function() { + it('should not throw when checking is disabled', function () { var testFunc = createTestFunc(false); argscheck.enableChecks = false; testFunc(); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.base64.js ---------------------------------------------------------------------- diff --git a/test/test.base64.js b/test/test.base64.js index 6248a36..317fe26 100644 --- a/test/test.base64.js +++ b/test/test.base64.js @@ -19,40 +19,41 @@ * */ -describe("base64", function () { +describe('base64', function () { var base64 = require('cordova/base64'); - it("can base64 encode strings correctly", function () { - var arrayBuffer = new ArrayBuffer(6), - view = new Uint8Array(arrayBuffer); + it('can base64 encode strings correctly', function () { + var arrayBuffer = new ArrayBuffer(6); + var view = new Uint8Array(arrayBuffer); for (var i = 0; i < view.length; i++) { view[i] = i; } - expect(base64.fromArrayBuffer(arrayBuffer.slice(0,1))).toBe('AA=='); - expect(base64.fromArrayBuffer(arrayBuffer.slice(0,2))).toBe('AAE='); - expect(base64.fromArrayBuffer(arrayBuffer.slice(0,3))).toBe('AAEC'); - expect(base64.fromArrayBuffer(arrayBuffer.slice(0,4))).toBe('AAECAw=='); - expect(base64.fromArrayBuffer(arrayBuffer.slice(0,5))).toBe('AAECAwQ='); + expect(base64.fromArrayBuffer(arrayBuffer.slice(0, 1))).toBe('AA=='); + expect(base64.fromArrayBuffer(arrayBuffer.slice(0, 2))).toBe('AAE='); + expect(base64.fromArrayBuffer(arrayBuffer.slice(0, 3))).toBe('AAEC'); + expect(base64.fromArrayBuffer(arrayBuffer.slice(0, 4))).toBe('AAECAw=='); + expect(base64.fromArrayBuffer(arrayBuffer.slice(0, 5))).toBe('AAECAwQ='); expect(base64.fromArrayBuffer(arrayBuffer)).toBe('AAECAwQF'); }); - it("can base64 encode a binary string in an ArrayBuffer", function () { - var arrayBuffer = new ArrayBuffer(256), - view = new Uint8Array(arrayBuffer); - base64string = 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w==' + it('can base64 encode a binary string in an ArrayBuffer', function () { + var arrayBuffer = new ArrayBuffer(256); + var view = new Uint8Array(arrayBuffer); + /* eslint-disable no-undef */ + base64string = 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=='; - for (var i = 0; i < view.length; i++) { - view[i] = i; - } + for (var i = 0; i < view.length; i++) { + view[i] = i; + } - expect(base64.fromArrayBuffer(arrayBuffer)).toBe(base64string); + expect(base64.fromArrayBuffer(arrayBuffer)).toBe(base64string); }); - it("can base64 encode an text string in an ArrayBuffer", function () { - var orig = 'Some Awesome Test This Is!' - , base64string = typeof btoa != 'undefined' ? btoa(orig) : new Buffer('Some Awesome Test This Is!', 'binary').toString('base64') - , arrayBuffer = new ArrayBuffer(orig.length) - , view = new Uint8Array(arrayBuffer); + it('can base64 encode an text string in an ArrayBuffer', function () { + var orig = 'Some Awesome Test This Is!'; + var base64string = typeof btoa !== 'undefined' ? btoa(orig) : Buffer.from('Some Awesome Test This Is!', 'binary').toString('base64'); + var arrayBuffer = new ArrayBuffer(orig.length); + var view = new Uint8Array(arrayBuffer); for (var i = 0; i < orig.length; i++) { view[i] = orig.charCodeAt(i); @@ -61,13 +62,13 @@ describe("base64", function () { expect(base64.fromArrayBuffer(arrayBuffer)).toBe(base64string); }); - it("can decode a base64-encoded text string into an ArrayBuffer", function () { - var orig = 'Some Awesome Test This Is!', - base64string = typeof btoa != 'undefined' ? btoa(orig) : new Buffer(orig, 'binary').toString('base64'); - + it('can decode a base64-encoded text string into an ArrayBuffer', function () { + var orig = 'Some Awesome Test This Is!'; + var base64string = typeof btoa !== 'undefined' ? btoa(orig) : Buffer.from(orig, 'binary').toString('base64'); + /* eslint-enable no-undef */ var arrayBuffer = base64.toArrayBuffer(base64string); - var testString = ""; + var testString = ''; var view = new Uint8Array(arrayBuffer); for (var i = 0; i < view.byteLength; i++) { testString += String.fromCharCode(view[i]); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.builder.js ---------------------------------------------------------------------- diff --git a/test/test.builder.js b/test/test.builder.js index 19f4769..324e00d 100644 --- a/test/test.builder.js +++ b/test/test.builder.js @@ -19,48 +19,47 @@ * */ -describe("builder", function () { +describe('builder', function () { var builder = require('cordova/builder'); - it("includes the module into the target", function () { - - var target = {}, - objects = { - foo: { - path: "cordova/builder" - } - }; + it('includes the module into the target', function () { + var target = {}; + var objects = { + foo: { + path: 'cordova/builder' + } + }; builder.buildIntoAndClobber(objects, target); expect(target.foo).toBeDefined(); - expect(target.foo).toBe(require("cordova/builder")); + expect(target.foo).toBe(require('cordova/builder')); }); - it("returns an empty object literal if no path", function () { - var target = {}, - objects = {cat: {}}; + it('returns an empty object literal if no path', function () { + var target = {}; + var objects = {cat: {}}; builder.buildIntoButDoNotClobber(objects, target); expect(target.cat).toBeDefined(); }); - it("builds out the children", function () { + it('builds out the children', function () { - var target = {}, - objects = { - homer: { - children: { - bart: {}, - lisa: {}, - maggie: { - path: "cordova/builder" - } - } - } - }; + var target = {}; + var objects = { + homer: { + children: { + bart: {}, + lisa: {}, + maggie: { + path: 'cordova/builder' + } + } + } + }; builder.buildIntoButDoNotClobber(objects, target); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.channel.js ---------------------------------------------------------------------- diff --git a/test/test.channel.js b/test/test.channel.js index dcd6700..c50fcf1 100644 --- a/test/test.channel.js +++ b/test/test.channel.js @@ -19,66 +19,66 @@ * */ -describe("channel", function () { - var channel = require('cordova/channel'), - multiChannel, - stickyChannel; +describe('channel', function () { + var channel = require('cordova/channel'); + var multiChannel; + var stickyChannel; - function callCount(spy) { + function callCount (spy) { return spy.argsForCall.length; } - function expectCallCount(spy, count) { + function expectCallCount (spy, count) { expect(callCount(spy)).toEqual(count); } - beforeEach(function() { + beforeEach(function () { multiChannel = channel.create('multiChannel'); stickyChannel = channel.createSticky('stickyChannel'); }); - describe("subscribe method", function() { - it("should throw an exception if no arguments are provided", function() { - expect(function() { + describe('subscribe method', function () { + it('should throw an exception if no arguments are provided', function () { + expect(function () { multiChannel.subscribe(); }).toThrow(); - expect(function() { + expect(function () { multiChannel.subscribe(null); }).toThrow(); - expect(function() { + expect(function () { multiChannel.subscribe(undefined); }).toThrow(); }); - it("should accept a function or an EventListener object implementing the handleEvent interface", function() { - expect(function() { + it('should accept a function or an EventListener object implementing the handleEvent interface', function () { + expect(function () { multiChannel.subscribe(function () {}); }).not.toThrow(); - expect(function() { + expect(function () { multiChannel.subscribe({handleEvent: function () {}}); }).not.toThrow(); - expect(function() { - multiChannel.subscribe({apply:function(){},call:function(){}}); + expect(function () { + multiChannel.subscribe({apply: function () {}, call: function () {}}); }).toThrow(); }); - it("should not change number of handlers if no function is provided", function() { + it('should not change number of handlers if no function is provided', function () { var initialLength = multiChannel.numHandlers; try { multiChannel.subscribe(); - } catch(e) {} + } catch (e) {} expect(multiChannel.numHandlers).toEqual(initialLength); try { multiChannel.subscribe(null); - } catch(e) {} + } catch (e) {} expect(multiChannel.numHandlers).toEqual(initialLength); }); - it("should not change number of handlers when subscribing same function multiple times", function() { - var handler = function(){}; + it('should not change number of handlers when subscribing same function multiple times', function () { + var handler = function () {}; multiChannel.subscribe(handler); multiChannel.subscribe(handler); @@ -90,38 +90,38 @@ describe("channel", function () { }); }); - describe("unsubscribe method", function() { - it("should throw an exception if no arguments are provided", function() { - expect(function() { + describe('unsubscribe method', function () { + it('should throw an exception if no arguments are provided', function () { + expect(function () { multiChannel.unsubscribe(); }).toThrow(); - expect(function() { + expect(function () { multiChannel.unsubscribe(null); }).toThrow(); }); - it("should accept a function or an EventListener object implementing the handleEvent interface", function() { - expect(function() { + it('should accept a function or an EventListener object implementing the handleEvent interface', function () { + expect(function () { multiChannel.unsubscribe(function () {}); }).not.toThrow(); - expect(function() { + expect(function () { multiChannel.unsubscribe({handleEvent: function () {}}); }).not.toThrow(); - expect(function() { - multiChannel.unsubscribe({apply:function(){},call:function(){}}); + expect(function () { + multiChannel.unsubscribe({apply: function () {}, call: function () {}}); }).toThrow(); }); - it("should not decrement numHandlers if unsubscribing something that does not exist", function() { - multiChannel.subscribe(function() {}); - multiChannel.unsubscribe(function() {}); + it('should not decrement numHandlers if unsubscribing something that does not exist', function () { + multiChannel.subscribe(function () {}); + multiChannel.unsubscribe(function () {}); expect(multiChannel.numHandlers).toEqual(1); }); - it("should change the handlers length appropriately", function() { - var firstHandler = function() {}; - var secondHandler = function() {}; - var thirdHandler = function() {}; + it('should change the handlers length appropriately', function () { + var firstHandler = function () {}; + var secondHandler = function () {}; + var thirdHandler = function () {}; multiChannel.subscribe(firstHandler); multiChannel.subscribe(secondHandler); @@ -136,8 +136,8 @@ describe("channel", function () { expect(multiChannel.numHandlers).toEqual(0); }); - it("should not decrement handlers length more than once if unsubscribing a single handler", function() { - var firstHandler = function(){}; + it('should not decrement handlers length more than once if unsubscribing a single handler', function () { + var firstHandler = function () {}; multiChannel.subscribe(firstHandler); expect(multiChannel.numHandlers).toEqual(1); @@ -149,9 +149,9 @@ describe("channel", function () { expect(multiChannel.numHandlers).toEqual(0); }); - it("should not unregister a function registered with a different handler", function() { - var cHandler = function(){}; - var c2Handler = function(){}; + it('should not unregister a function registered with a different handler', function () { + var cHandler = function () {}; + var c2Handler = function () {}; var c2 = channel.create('jables'); multiChannel.subscribe(cHandler); c2.subscribe(c2Handler); @@ -167,8 +167,8 @@ describe("channel", function () { }); }); - function commonFireTests(multi) { - it("should fire all subscribed handlers", function() { + function commonFireTests (multi) { + it('should fire all subscribed handlers', function () { var testChannel = multi ? multiChannel : stickyChannel; var handler = jasmine.createSpy(); var anotherOne = jasmine.createSpy(); @@ -181,16 +181,16 @@ describe("channel", function () { expectCallCount(handler, 1); expectCallCount(anotherOne, 1); }); - it("should pass params to handlers", function() { + it('should pass params to handlers', function () { var testChannel = multi ? multiChannel : stickyChannel; var handler = jasmine.createSpy(); testChannel.subscribe(handler); testChannel.fire(1, 2, 3); - expect(handler.argsForCall[0]).toEqual({0:1, 1:2, 2:3}); + expect(handler.argsForCall[0]).toEqual({0: 1, 1: 2, 2: 3}); }); - it("should not fire a handler that was unsubscribed", function() { + it('should not fire a handler that was unsubscribed', function () { var testChannel = multi ? multiChannel : stickyChannel; var handler = jasmine.createSpy(); var anotherOne = jasmine.createSpy(); @@ -204,7 +204,7 @@ describe("channel", function () { expectCallCount(handler, 0); expectCallCount(anotherOne, 1); }); - it("should not fire a handler more than once if it was subscribed more than once", function() { + it('should not fire a handler more than once if it was subscribed more than once', function () { var testChannel = multi ? multiChannel : stickyChannel; var handler = jasmine.createSpy(); @@ -216,7 +216,7 @@ describe("channel", function () { expectCallCount(handler, 1); }); - it("handler should be called when subscribed, removed, and subscribed again", function() { + it('handler should be called when subscribed, removed, and subscribed again', function () { var testChannel = multi ? multiChannel : stickyChannel; var handler = jasmine.createSpy(); @@ -228,9 +228,9 @@ describe("channel", function () { expectCallCount(handler, 1); }); - it("should not prevent a callback from firing when it is removed during firing.", function() { + it('should not prevent a callback from firing when it is removed during firing.', function () { var testChannel = multi ? multiChannel : stickyChannel; - var handler = jasmine.createSpy().andCallFake(function() { testChannel.unsubscribe(handler2); }); + var handler = jasmine.createSpy().andCallFake(function () { testChannel.unsubscribe(handler2); }); var handler2 = jasmine.createSpy(); testChannel.subscribe(handler); testChannel.subscribe(handler2); @@ -239,11 +239,11 @@ describe("channel", function () { expectCallCount(handler2, 1); }); } - describe("fire method for sticky channels", function() { + describe('fire method for sticky channels', function () { commonFireTests(false); - it("should instantly trigger the callback if the event has already been fired", function () { - var before = jasmine.createSpy('before'), - after = jasmine.createSpy('after'); + it('should instantly trigger the callback if the event has already been fired', function () { + var before = jasmine.createSpy('before'); + var after = jasmine.createSpy('after'); stickyChannel.subscribe(before); stickyChannel.fire(1, 2, 3); @@ -251,18 +251,18 @@ describe("channel", function () { expectCallCount(before, 1); expectCallCount(after, 1); - expect(after.argsForCall[0]).toEqual({0:1, 1:2, 2:3}); + expect(after.argsForCall[0]).toEqual({0: 1, 1: 2, 2: 3}); }); - it("should instantly trigger the callback if the event is currently being fired.", function () { - var handler1 = jasmine.createSpy().andCallFake(function() { stickyChannel.subscribe(handler2); }), - handler2 = jasmine.createSpy().andCallFake(function(arg1) { expect(arg1).toEqual('foo');}); + it('should instantly trigger the callback if the event is currently being fired.', function () { + var handler1 = jasmine.createSpy().andCallFake(function () { stickyChannel.subscribe(handler2); }); + var handler2 = jasmine.createSpy().andCallFake(function (arg1) { expect(arg1).toEqual('foo'); }); stickyChannel.subscribe(handler1); stickyChannel.fire('foo'); expectCallCount(handler2, 1); }); - it("should unregister all handlers after being fired.", function() { + it('should unregister all handlers after being fired.', function () { var handler = jasmine.createSpy(); stickyChannel.subscribe(handler); stickyChannel.fire(); @@ -270,11 +270,11 @@ describe("channel", function () { expectCallCount(handler, 1); }); }); - describe("fire method for multi channels", function() { + describe('fire method for multi channels', function () { commonFireTests(true); - it("should not trigger the callback if the event has already been fired", function () { - var before = jasmine.createSpy('before'), - after = jasmine.createSpy('after'); + it('should not trigger the callback if the event has already been fired', function () { + var before = jasmine.createSpy('before'); + var after = jasmine.createSpy('after'); multiChannel.subscribe(before); multiChannel.fire(); @@ -283,9 +283,9 @@ describe("channel", function () { expectCallCount(before, 1); expectCallCount(after, 0); }); - it("should not trigger the callback if the event is currently being fired.", function () { - var handler1 = jasmine.createSpy().andCallFake(function() { multiChannel.subscribe(handler2); }), - handler2 = jasmine.createSpy(); + it('should not trigger the callback if the event is currently being fired.', function () { + var handler1 = jasmine.createSpy().andCallFake(function () { multiChannel.subscribe(handler2); }); + var handler2 = jasmine.createSpy(); multiChannel.subscribe(handler1); multiChannel.fire(); @@ -294,7 +294,7 @@ describe("channel", function () { expectCallCount(handler1, 2); expectCallCount(handler2, 1); }); - it("should not unregister handlers after being fired.", function() { + it('should not unregister handlers after being fired.', function () { var handler = jasmine.createSpy(); multiChannel.subscribe(handler); multiChannel.fire(); @@ -302,10 +302,10 @@ describe("channel", function () { expectCallCount(handler, 2); }); }); - describe("channel.join()", function() { - it("should be called when all functions start unfired", function() { - var handler = jasmine.createSpy(), - stickyChannel2 = channel.createSticky('stickyChannel'); + describe('channel.join()', function () { + it('should be called when all functions start unfired', function () { + var handler = jasmine.createSpy(); + var stickyChannel2 = channel.createSticky('stickyChannel'); channel.join(handler, [stickyChannel, stickyChannel2]); expectCallCount(handler, 0); stickyChannel.fire(); @@ -313,41 +313,41 @@ describe("channel", function () { stickyChannel2.fire(); expectCallCount(handler, 1); }); - it("should be called when one functions start fired", function() { - var handler = jasmine.createSpy(), - stickyChannel2 = channel.createSticky('stickyChannel'); + it('should be called when one functions start fired', function () { + var handler = jasmine.createSpy(); + var stickyChannel2 = channel.createSticky('stickyChannel'); stickyChannel.fire(); channel.join(handler, [stickyChannel, stickyChannel2]); expectCallCount(handler, 0); stickyChannel2.fire(); expectCallCount(handler, 1); }); - it("should be called when all functions start fired", function() { - var handler = jasmine.createSpy(), - stickyChannel2 = channel.createSticky('stickyChannel'); + it('should be called when all functions start fired', function () { + var handler = jasmine.createSpy(); + var stickyChannel2 = channel.createSticky('stickyChannel'); stickyChannel.fire(); stickyChannel2.fire(); channel.join(handler, [stickyChannel, stickyChannel2]); expectCallCount(handler, 1); }); - it("should throw if a channel is not sticky", function() { - expect(function() { - channel.join(function(){}, [stickyChannel, multiChannel]); + it('should throw if a channel is not sticky', function () { + expect(function () { + channel.join(function () {}, [stickyChannel, multiChannel]); }).toThrow(); }); }); - describe("onHasSubscribersChange", function() { - it("should be called only when the first subscriber is added and last subscriber is removed.", function() { - var handler = jasmine.createSpy().andCallFake(function() { - if (callCount(handler) == 1) { + describe('onHasSubscribersChange', function () { + it('should be called only when the first subscriber is added and last subscriber is removed.', function () { + var handler = jasmine.createSpy().andCallFake(function () { + if (callCount(handler) === 1) { expect(this.numHandlers).toEqual(1); } else { expect(this.numHandlers).toEqual(0); } }); multiChannel.onHasSubscribersChange = handler; - function foo1() {} - function foo2() {} + function foo1 () {} + function foo2 () {} multiChannel.subscribe(foo1); multiChannel.subscribe(foo2); multiChannel.unsubscribe(foo1); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.modulemapper.js ---------------------------------------------------------------------- diff --git a/test/test.modulemapper.js b/test/test.modulemapper.js index 2891099..8e6eb4c 100644 --- a/test/test.modulemapper.js +++ b/test/test.modulemapper.js @@ -18,33 +18,33 @@ * */ -describe('modulemapper', function() { - var modulemapper = require('cordova/modulemapper'), - testmodule = require('cordova/test/testmodule'), - utils = require('cordova/utils'); +describe('modulemapper', function () { + var modulemapper = require('cordova/modulemapper'); + var testmodule = require('cordova/test/testmodule'); + var utils = require('cordova/utils'); var context; - beforeEach(function() { - function TestClass() {} - TestClass.prototype.method1 = function() { return 'orig'; }; + beforeEach(function () { + function TestClass () {} + TestClass.prototype.method1 = function () { return 'orig'; }; context = { - func: function() {}, + func: function () {}, num: 1, obj: { str: 'hello', num: 8, subObj: {num: 9} }, TestClass: TestClass }; - utils.defineGetter(context, 'getme', function() { return 'getter' }); + utils.defineGetter(context, 'getme', function () { return 'getter'; }); }); - afterEach(function() { + afterEach(function () { modulemapper.reset(); }); - it('should throw in module does not exist', function() { - expect(function() { modulemapper.clobbers('cordova/invalid', 'newProp'); }).toThrow(); + it('should throw in module does not exist', function () { + expect(function () { modulemapper.clobbers('cordova/invalid', 'newProp'); }).toThrow(); }); - it('should properly set a new top-level property', function() { + it('should properly set a new top-level property', function () { modulemapper.clobbers('cordova/test/testmodule', 'newProp1'); modulemapper.defaults('cordova/test/testmodule', 'newProp2'); modulemapper.merges('cordova/test/testmodule', 'newProp3'); @@ -53,7 +53,7 @@ describe('modulemapper', function() { expect(context.newProp2).toBe(testmodule); expect(context.newProp3).toBe(testmodule); }); - it('should properly set a new non-top-level property', function() { + it('should properly set a new non-top-level property', function () { modulemapper.clobbers('cordova/test/testmodule', 'foo1.newProp'); modulemapper.defaults('cordova/test/testmodule', 'foo2.newProp'); modulemapper.merges('cordova/test/testmodule', 'foo3.newProp'); @@ -62,7 +62,7 @@ describe('modulemapper', function() { expect(context.foo2.newProp).toBe(testmodule); expect(context.foo3.newProp).toBe(testmodule); }); - it('should properly set a new non-top-level property #2', function() { + it('should properly set a new non-top-level property #2', function () { modulemapper.clobbers('cordova/test/testmodule', 'foo1.bar.newProp'); modulemapper.defaults('cordova/test/testmodule', 'foo2.bar.newProp'); modulemapper.merges('cordova/test/testmodule', 'foo3.bar.newProp'); @@ -71,7 +71,7 @@ describe('modulemapper', function() { expect(context.foo2.bar.newProp).toBe(testmodule); expect(context.foo3.bar.newProp).toBe(testmodule); }); - it('should properly set a non-new non-top-level property', function() { + it('should properly set a non-new non-top-level property', function () { modulemapper.clobbers('cordova/test/testmodule', 'obj.newProp1'); modulemapper.defaults('cordova/test/testmodule', 'obj.newProp2'); modulemapper.merges('cordova/test/testmodule', 'obj.newProp3'); @@ -80,7 +80,7 @@ describe('modulemapper', function() { expect(context.obj.newProp2).toBe(testmodule); expect(context.obj.newProp3).toBe(testmodule); }); - it('should clobber existing properties', function() { + it('should clobber existing properties', function () { modulemapper.clobbers('cordova/test/testmodule', 'num'); modulemapper.clobbers('cordova/test/testmodule', 'obj.str'); modulemapper.clobbers('cordova/test/testmodule', 'getme'); @@ -91,7 +91,7 @@ describe('modulemapper', function() { expect(context.getme).toBe(testmodule); expect(context.TestClass).toBe(testmodule); }); - it('should not clobber existing properties when using defaults', function() { + it('should not clobber existing properties when using defaults', function () { modulemapper.defaults('cordova/test/testmodule', 'num'); modulemapper.defaults('cordova/test/testmodule', 'obj.str'); modulemapper.defaults('cordova/test/testmodule', 'obj.getme'); @@ -102,17 +102,17 @@ describe('modulemapper', function() { expect(context.getme).not.toBe(testmodule); expect(context.TestClass).not.toBe(testmodule); }); - it('should throw when namespace is a non-object', function() { - expect(function() { + it('should throw when namespace is a non-object', function () { + expect(function () { modulemapper.merges('cordova/test/testmodule', 'num'); modulemapper.mapModules(context); }).toThrow(); }); - it('should merge into objects', function() { + it('should merge into objects', function () { modulemapper.merges('cordova/test/testmodule', 'obj'); modulemapper.mapModules(context); for (var k in testmodule) { - if (k != 'subObj') { + if (k !== 'subObj') { expect(context.obj[k]).toBe(testmodule[k]); } } @@ -120,20 +120,20 @@ describe('modulemapper', function() { expect(context.obj.subObj.num).toBe(9); expect(context.obj.subObj.str).toBe(testmodule.subObj.str); }); - it('should merge into constructor prototypes', function() { + it('should merge into constructor prototypes', function () { modulemapper.merges('cordova/test/testmodule', 'TestClass'); modulemapper.mapModules(context); for (var k in testmodule) { expect(context.TestClass.prototype[k]).toBe(testmodule[k]); } }); - it('should maintain order of calls', function() { + it('should maintain order of calls', function () { modulemapper.merges('cordova/test/testmodule', 'obj'); modulemapper.clobbers('cordova/test/testmodule', 'obj'); modulemapper.mapModules(context); expect(context.obj).toBe(testmodule); }); - it('should maintain order of calls2', function() { + it('should maintain order of calls2', function () { modulemapper.merges('cordova/test/testmodule', 'obj.foo'); modulemapper.clobbers('cordova/test/testmodule', 'obj'); modulemapper.merges('cordova/test/testmodule', 'obj.obj'); @@ -143,33 +143,33 @@ describe('modulemapper', function() { expect(context.obj).not.toBe(testmodule.obj); expect(context.obj.obj).toBe(testmodule.obj); }); - it('should return undefined for getOriginalSymbol("unknown")', function() { + it('should return undefined for getOriginalSymbol("unknown")', function () { expect(modulemapper.getOriginalSymbol(context, 'blah')).toBeUndefined(); modulemapper.mapModules(context); expect(modulemapper.getOriginalSymbol(context, 'obj.foo.bar')).toBeUndefined('obj.foo.bar'); }); - it('should remember original symbols when clobbering', function() { + it('should remember original symbols when clobbering', function () { var orig = context.obj; modulemapper.clobbers('cordova/test/testmodule', 'obj'); modulemapper.mapModules(context); expect(modulemapper.getOriginalSymbol(context, 'obj')).toBe(orig); }); - it('should remember original symbols when double clobbering', function() { + it('should remember original symbols when double clobbering', function () { var orig = context.obj; modulemapper.clobbers('cordova/test/testmodule', 'obj'); modulemapper.clobbers('cordova/test/testmodule', 'obj'); modulemapper.mapModules(context); expect(modulemapper.getOriginalSymbol(context, 'obj')).toBe(orig); }); - it('should return original symbols when symbol was not clobbered', function() { + it('should return original symbols when symbol was not clobbered', function () { modulemapper.mapModules(context); expect(modulemapper.getOriginalSymbol(context, 'obj')).toBe(context.obj); expect(modulemapper.getOriginalSymbol(context, 'obj.str')).toBe(context.obj.str); }); - it('should log about deprecated property access', function() { + it('should log about deprecated property access', function () { var origConsoleLog = console.log; console.log = jasmine.createSpy('console.log'); - this.after(function() { + this.after(function () { console.log = origConsoleLog; }); modulemapper.clobbers('cordova/test/testmodule', 'obj', 'Use foo instead'); @@ -183,4 +183,3 @@ describe('modulemapper', function() { expect(console.log.callCount).toBe(2); }); }); - http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.pluginloader.js ---------------------------------------------------------------------- diff --git a/test/test.pluginloader.js b/test/test.pluginloader.js index bb36f13..283f3b2 100644 --- a/test/test.pluginloader.js +++ b/test/test.pluginloader.js @@ -19,13 +19,13 @@ * */ -describe('pluginloader', function() { +describe('pluginloader', function () { var pluginloader = require('cordova/pluginloader'); var injectScript; var cdvScript; var done; var success; - beforeEach(function() { + beforeEach(function () { injectScript = spyOn(pluginloader, 'injectScript'); var el = document.createElement('script'); el.setAttribute('type', 'foo'); @@ -35,28 +35,31 @@ describe('pluginloader', function() { done = false; success = false; }); - afterEach(function() { + afterEach(function () { if (cdvScript) { cdvScript.parentNode.removeChild(cdvScript); cdvScript = null; } + /* eslint-disable no-undef */ define.remove('cordova/plugin_list'); define.remove('some.id'); + /* eslint-enable no-undef */ }); - function setDone() { + function setDone () { done = true; } - it('should inject cordova_plugins.js when it is not already there', function() { - injectScript.andCallFake(function(url, onload, onerror) { + it('should inject cordova_plugins.js when it is not already there', function () { + injectScript.andCallFake(function (url, onload, onerror) { // jsdom deficiencies: - if (typeof location != 'undefined') { - expect(url).toBe(window.location.href.replace(/\/[^\/]*?$/, '/foo/cordova_plugins.js')); + if (typeof location !== 'undefined') { + expect(url).toBe(window.location.href.replace(/\/[^\/]*?$/, '/foo/cordova_plugins.js')); // eslint-disable-line no-useless-escape } else { expect(url).toBe('foo/cordova_plugins.js'); } - define('cordova/plugin_list', function(require, exports, module) { + /* eslint-disable no-undef */ + define('cordova/plugin_list', function (require, exports, module) { module.exports = []; }); success = true; @@ -64,59 +67,59 @@ describe('pluginloader', function() { }); pluginloader.load(setDone); - waitsFor(function() { return done }); - runs(function() { + waitsFor(function () { return done; }); + runs(function () { expect(success).toBe(true); }); }); - it('should not inject cordova_plugins.js when it is already there', function() { - define('cordova/plugin_list', function(require, exports, module) { + it('should not inject cordova_plugins.js when it is already there', function () { + define('cordova/plugin_list', function (require, exports, module) { module.exports = []; }); pluginloader.load(setDone); - waitsFor(function() { return done }); - runs(function() { + waitsFor(function () { return done; }); + runs(function () { expect(injectScript).not.toHaveBeenCalled(); }); }); - - it('should inject plugin scripts when they are not already there', function() { - define('cordova/plugin_list', function(require, exports, module) { + it('should inject plugin scripts when they are not already there', function () { + define('cordova/plugin_list', function (require, exports, module) { module.exports = [ - { "file": "some/path.js", "id": "some.id" } + { 'file': 'some/path.js', 'id': 'some.id' } ]; }); - injectScript.andCallFake(function(url, onload, onerror) { + injectScript.andCallFake(function (url, onload, onerror) { // jsdom deficiencies: - if (typeof location != 'undefined') { - expect(url).toBe(window.location.href.replace(/\/[^\/]*?$/, '/foo/some/path.js')); + if (typeof location !== 'undefined') { + expect(url).toBe(window.location.href.replace(/\/[^\/]*?$/, '/foo/some/path.js')); // eslint-disable-line no-useless-escape } else { expect(url).toBe('foo/some/path.js'); } - define('some.id', function(require, exports, module) { + define('some.id', function (require, exports, module) { }); success = true; onload(); }); pluginloader.load(setDone); - waitsFor(function() { return done }); - runs(function() { + waitsFor(function () { return done; }); + runs(function () { expect(success).toBe(true); }); }); - it('should not inject plugin scripts when they are already there', function() { - define('cordova/plugin_list', function(require, exports, module) { + it('should not inject plugin scripts when they are already there', function () { + define('cordova/plugin_list', function (require, exports, module) { module.exports = [ - { "file": "some/path.js", "id": "some.id" } + { 'file': 'some/path.js', 'id': 'some.id' } ]; }); - define('some.id', function(require, exports, module) { + define('some.id', function (require, exports, module) { }); + /* eslint-enable no-undef */ pluginloader.load(setDone); - waitsFor(function() { return done }); - runs(function() { + waitsFor(function () { return done; }); + runs(function () { expect(injectScript).not.toHaveBeenCalled(); }); }); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.require.js ---------------------------------------------------------------------- diff --git a/test/test.require.js b/test/test.require.js index ec40a24..7bde4a4 100644 --- a/test/test.require.js +++ b/test/test.require.js @@ -18,142 +18,142 @@ * under the License. * */ - -describe("require + define", function () { - it("exists off of cordova", function () { +/* eslint-disable no-undef */ +describe('require + define', function () { + it('exists off of cordova', function () { var cordova = require('cordova'); expect(cordova.require).toBeDefined(); expect(cordova.define).toBeDefined(); }); - describe("when defining", function () { - it("can define and remove module", function () { - define("a", jasmine.createSpy()); - define.remove("a"); + describe('when defining', function () { + it('can define and remove module', function () { + define('a', jasmine.createSpy()); + define.remove('a'); }); it("can remove a module that doesn't exist", function () { define.remove("can't touch this"); }); - it("throws an error the module already exists", function () { + it('throws an error the module already exists', function () { expect(function () { - define("cordova", function () {}); - }).toThrow("module cordova already defined"); + define('cordova', function () {}); + }).toThrow('module cordova already defined'); }); it("doesn't call the factory method when defining", function () { var factory = jasmine.createSpy(); - define("ff", factory); + define('ff', factory); expect(factory).not.toHaveBeenCalled(); }); }); - describe("when requiring", function () { + describe('when requiring', function () { it("throws an exception when module doesn't exist", function () { expect(function () { - require("your mom"); - }).toThrow("module your mom not found"); + require('your mom'); + }).toThrow('module your mom not found'); }); - it("throws an exception when modules depend on each other", function () { - define("ModuleA", function(require, exports, module) { - require("ModuleB"); + it('throws an exception when modules depend on each other', function () { + define('ModuleA', function (require, exports, module) { + require('ModuleB'); }); - define("ModuleB", function(require, exports, module) { - require("ModuleA"); + define('ModuleB', function (require, exports, module) { + require('ModuleA'); }); expect(function () { - require("ModuleA"); - }).toThrow("Cycle in require graph: ModuleA->ModuleB->ModuleA"); - define.remove("ModuleA"); - define.remove("ModuleB"); + require('ModuleA'); + }).toThrow('Cycle in require graph: ModuleA->ModuleB->ModuleA'); + define.remove('ModuleA'); + define.remove('ModuleB'); }); - it("throws an exception when a cycle of requires occurs", function () { - define("ModuleA", function(require, exports, module) { - require("ModuleB"); + it('throws an exception when a cycle of requires occurs', function () { + define('ModuleA', function (require, exports, module) { + require('ModuleB'); }); - define("ModuleB", function(require, exports, module) { - require("ModuleC"); + define('ModuleB', function (require, exports, module) { + require('ModuleC'); }); - define("ModuleC", function(require, exports, module) { - require("ModuleA"); + define('ModuleC', function (require, exports, module) { + require('ModuleA'); }); expect(function () { - require("ModuleA"); - }).toThrow("Cycle in require graph: ModuleA->ModuleB->ModuleC->ModuleA"); - define.remove("ModuleA"); - define.remove("ModuleB"); - define.remove("ModuleC"); + require('ModuleA'); + }).toThrow('Cycle in require graph: ModuleA->ModuleB->ModuleC->ModuleA'); + define.remove('ModuleA'); + define.remove('ModuleB'); + define.remove('ModuleC'); }); - it("calls the factory method when requiring", function () { + it('calls the factory method when requiring', function () { var factory = jasmine.createSpy(); - define("dino", factory); - require("dino"); + define('dino', factory); + require('dino'); expect(factory).toHaveBeenCalledWith(jasmine.any(Function), {}, { - id: "dino", + id: 'dino', exports: {} }); - define.remove("dino"); + define.remove('dino'); }); - it("returns the exports object", function () { - define("a", function (require, exports, module) { - exports.stuff = "asdf"; + it('returns the exports object', function () { + define('a', function (require, exports, module) { + exports.stuff = 'asdf'; }); - var v = require("a"); - expect(v.stuff).toBe("asdf"); - define.remove("a"); + var v = require('a'); + expect(v.stuff).toBe('asdf'); + define.remove('a'); }); - it("can use both the exports and module.exports object", function () { - define("a", function (require, exports, module) { - exports.a = "a"; - module.exports.b = "b"; + it('can use both the exports and module.exports object', function () { + define('a', function (require, exports, module) { + exports.a = 'a'; + module.exports.b = 'b'; }); - var v = require("a"); - expect(v.a).toBe("a"); - expect(v.b).toBe("b"); - define.remove("a"); + var v = require('a'); + expect(v.a).toBe('a'); + expect(v.b).toBe('b'); + define.remove('a'); }); - it("returns was is assigned to module.exports", function () { + it('returns was is assigned to module.exports', function () { var Foo = function () { }; - define("a", function (require, exports, module) { + define('a', function (require, exports, module) { module.exports = new Foo(); }); - var v = require("a"); + var v = require('a'); expect(v instanceof Foo).toBe(true); - define.remove("a"); + define.remove('a'); }); - it("has the id and exports values but not the factory on the module object", function () { + it('has the id and exports values but not the factory on the module object', function () { var factory = function (require, exports, module) { - expect(module.id).toBe("a"); + expect(module.id).toBe('a'); expect(module.exports).toBeDefined(); expect(module.factory).not.toBeDefined(); }; - define("a", factory); - require("a"); + define('a', factory); + require('a'); }); it("can handle multiple defined modules that use cordova's unique handling of relative require paths", function () { - define("plugin.ios.foo", function (require, exports, module) { - module.exports = require("./bar") * 2; + define('plugin.ios.foo', function (require, exports, module) { + module.exports = require('./bar') * 2; }); - define("plugin.ios.bar", function (require, exports, module) { + define('plugin.ios.bar', function (require, exports, module) { module.exports = 2; }); - expect(require("plugin.ios.foo")).toEqual(4); + expect(require('plugin.ios.foo')).toEqual(4); }); }); }); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.urlutil.js ---------------------------------------------------------------------- diff --git a/test/test.urlutil.js b/test/test.urlutil.js index a3142d0..4d18aab 100644 --- a/test/test.urlutil.js +++ b/test/test.urlutil.js @@ -21,7 +21,7 @@ describe('urlutil', function () { var urlutil = require('cordova/urlutil'); - if (typeof process != 'undefined') { + if (typeof process !== 'undefined') { // Tests don't work under jsdom. return; } @@ -32,7 +32,7 @@ describe('urlutil', function () { expect(urlutil.makeAbsolute('http://www.foo.com/%20hi')).toBe('http://www.foo.com/%20hi'); }); - function testRootRelative(url) { + function testRootRelative (url) { var rootUrl = url.slice(0, 10) + url.slice(10).replace(/[?#].*/, '').replace(/\/.*/, '') + '/'; expect(urlutil.makeAbsolute('/')).toBe(rootUrl); expect(urlutil.makeAbsolute('/foo?a#b')).toBe(rootUrl + 'foo?a#b'); @@ -43,7 +43,7 @@ describe('urlutil', function () { }); it('can handle relative URLs', function () { - var rootUrl = window.location.href.replace(/[?#].*/, '').replace(/[^\/]*$/, ''); + var rootUrl = window.location.href.replace(/[?#].*/, '').replace(/[^\/]*$/, ''); // eslint-disable-line no-useless-escape expect(urlutil.makeAbsolute('foo?a#b')).toBe(rootUrl + 'foo?a#b'); expect(urlutil.makeAbsolute('foo/b%20ar')).toBe(rootUrl + 'foo/b%20ar'); }); @@ -53,7 +53,7 @@ describe('urlutil', function () { var baseTag = document.createElement('base'); baseTag.href = rootUrl; document.head.appendChild(baseTag); - this.after(function() { + this.after(function () { document.head.removeChild(baseTag); }); expect(urlutil.makeAbsolute('foo?a#b')).toBe(rootUrl + 'foo?a#b'); http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c75e8059/test/test.utils.js ---------------------------------------------------------------------- diff --git a/test/test.utils.js b/test/test.utils.js index 00f4da9..abf2a9b 100644 --- a/test/test.utils.js +++ b/test/test.utils.js @@ -19,158 +19,158 @@ * */ -describe("utils", function () { +describe('utils', function () { var utils = require('cordova/utils'); - describe("utils.arrayIndexOf", function() { - it("should return -1 when not found", function() { - expect(utils.arrayIndexOf([1,2,3], 4)).toBe(-1); + describe('utils.arrayIndexOf', function () { + it('should return -1 when not found', function () { + expect(utils.arrayIndexOf([1, 2, 3], 4)).toBe(-1); }); - it("should return 0 for first item", function() { - expect(utils.arrayIndexOf([1,2,3], 1)).toBe(0); + it('should return 0 for first item', function () { + expect(utils.arrayIndexOf([1, 2, 3], 1)).toBe(0); }); - it("should return 2 for last item", function() { - expect(utils.arrayIndexOf([1,2,3], 3)).toBe(2); + it('should return 2 for last item', function () { + expect(utils.arrayIndexOf([1, 2, 3], 3)).toBe(2); }); - it("should return index of first occurance", function() { - expect(utils.arrayIndexOf([1,2,1], 1)).toBe(0); + it('should return index of first occurance', function () { + expect(utils.arrayIndexOf([1, 2, 1], 1)).toBe(0); }); }); - describe("utils.arrayRemove", function() { - it("should return true when removed.", function() { + describe('utils.arrayRemove', function () { + it('should return true when removed.', function () { var a = [1, 2, 3]; expect(utils.arrayRemove(a, 2)).toBe(true); expect(a).toEqual([1, 3]); }); - it("should return false when item was not there.", function() { + it('should return false when item was not there.', function () { var a = [1, 2, 3]; expect(utils.arrayRemove(a, 4)).toBe(false); expect(a).toEqual([1, 2, 3]); }); - it("should remove only first occurance", function() { + it('should remove only first occurance', function () { var a = [1, 2, 1]; expect(utils.arrayRemove(a, 1)).toBe(true); expect(a).toEqual([2, 1]); }); }); - describe("isArray",function() { - it("should return true for [].", function() { + describe('isArray', function () { + it('should return true for [].', function () { var isArray = utils.isArray([]); expect(isArray).toBe(true); }); - it("should return true for new Array().", function() { - var isArray = utils.isArray(new Array()); + it('should return true for new Array().', function () { + var isArray = utils.isArray(new Array()); // eslint-disable-line no-array-constructor expect(isArray).toBe(true); }); - it("should return false for {}.", function() { + it('should return false for {}.', function () { var isArray = utils.isArray({}); expect(isArray).toBe(false); }); }); - describe("isDate",function() { - it("should return true for new Date().", function() { + describe('isDate', function () { + it('should return true for new Date().', function () { var isDate = utils.isDate(new Date()); expect(isDate).toBe(true); }); - it("should return false for {}.", function() { + it('should return false for {}.', function () { var isDate = utils.isDate({}); expect(isDate).toBe(false); }); }); - describe("when cloning", function () { - it("can clone an array", function () { - var orig = [1, 2, 3, {four: 4}, "5"]; + describe('when cloning', function () { + it('can clone an array', function () { + var orig = [1, 2, 3, {four: 4}, '5']; expect(utils.clone(orig)).toEqual(orig); expect(utils.clone(orig)).not.toBe(orig); }); - it("can clone null", function () { + it('can clone null', function () { expect(utils.clone(null)).toBeNull(); }); - it("can clone undefined", function () { + it('can clone undefined', function () { expect(utils.clone(undefined)).not.toBeDefined(); }); - it("can clone a function", function () { + it('can clone a function', function () { var f = function () { return 4; }; expect(utils.clone(f)).toBe(f); }); - it("can clone a number", function () { + it('can clone a number', function () { expect(utils.clone(4)).toBe(4); }); - it("can clone a string", function () { - expect(utils.clone("why")).toBe("why"); + it('can clone a string', function () { + expect(utils.clone('why')).toBe('why'); }); - it("can clone a date", function () { + it('can clone a date', function () { var d = Date.now(); expect(utils.clone(d)).toBe(d); }); - it("can clone an object", function () { + it('can clone an object', function () { var orig = { a: { b: { - c: "d" - }, + c: 'd' + } }, - e: "f", - g: "unit" - }, - expected = { + e: 'f', + g: 'unit' + }; + var expected = { a: { b: { - c: "d" - }, + c: 'd' + } }, - e: "f", - g: "unit" + e: 'f', + g: 'unit' }; expect(utils.clone(orig)).toEqual(expected); }); }); - describe("when closing around a function", function () { - it("calls the original function when calling the closed function", function () { + describe('when closing around a function', function () { + it('calls the original function when calling the closed function', function () { var f = jasmine.createSpy(); utils.close(null, f)(); expect(f).toHaveBeenCalled(); }); - it("uses the correct context for the closed function", function () { + it('uses the correct context for the closed function', function () { var context = {}; utils.close(context, function () { expect(this).toBe(context); })(); }); - it("passes the arguments to the closed function", function () { + it('passes the arguments to the closed function', function () { utils.close(null, function (arg) { expect(arg).toBe(1); })(1); }); - it("overrides the arguments when provided", function () { + it('overrides the arguments when provided', function () { utils.close(null, function (arg) { expect(arg).toBe(42); }, [42])(16); }); }); - it("can create a uuid", function () { + it('can create a uuid', function () { var uuid = utils.createUUID(); expect(uuid).toMatch(/^(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$/); expect(uuid).not.toEqual(utils.createUUID()); }); - + }); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
