[CB-3741] Fix BB10 unit and integration tests - copy utils to cordova/lib - update target tests - remove test for debug token .bar check (functionality not needed) - remove test for Device.name (deprecated and removed)
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/ff617f46 Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/ff617f46 Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/ff617f46 Branch: refs/heads/master Commit: ff617f46e15b5b75722390fb8af612c814a8fcf9 Parents: bf507e7 Author: Bryan Higgins <[email protected]> Authored: Wed Jun 19 14:10:03 2013 -0400 Committer: Jeffrey Heifetz <[email protected]> Committed: Fri Jun 21 17:39:58 2013 -0400 ---------------------------------------------------------------------- blackberry10/.gitignore | 8 +-- .../templates/project/cordova/lib/session.js | 2 +- .../bin/test/cordova/integration/target.js | 52 +++++++++++++------- .../cordova/unit/spec/lib/native-packager.js | 12 ----- blackberry10/bin/test/plugins/Device/index.js | 1 - blackberry10/scripts/test.js | 3 +- 6 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/.gitignore ---------------------------------------------------------------------- diff --git a/blackberry10/.gitignore b/blackberry10/.gitignore index f2802d1..5fc9030 100644 --- a/blackberry10/.gitignore +++ b/blackberry10/.gitignore @@ -1,6 +1,7 @@ # OS X .DS_Store +tags # Eclipse @@ -19,9 +20,4 @@ bin/node_modules bin/templates/project/lib example/ node_modules/ - -# OS X - -.DS_Store - -tags +bin/templates/project/cordova/lib/utils.js http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/bin/templates/project/cordova/lib/session.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/templates/project/cordova/lib/session.js b/blackberry10/bin/templates/project/cordova/lib/session.js index bb9fa06..02ae91a 100644 --- a/blackberry10/bin/templates/project/cordova/lib/session.js +++ b/blackberry10/bin/templates/project/cordova/lib/session.js @@ -54,7 +54,7 @@ module.exports = { signingPassword, outputDir = cmdline.output, properties = require("../../project.json"), - archivePath = path.resolve(cmdline.args[0]), + archivePath = path.resolve(cmdline.args[0] ? cmdline.args[0] : "../../www"), archiveName = properties.barName ? properties.barName : path.basename(archivePath, '.zip'), appdesc, buildId = cmdline.buildId; http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/bin/test/cordova/integration/target.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/test/cordova/integration/target.js b/blackberry10/bin/test/cordova/integration/target.js index c636672..d8d067a 100644 --- a/blackberry10/bin/test/cordova/integration/target.js +++ b/blackberry10/bin/test/cordova/integration/target.js @@ -22,8 +22,12 @@ var childProcess = require('child_process'), appFolder = tempFolder + 'tempCordovaApp/', projectFile = 'project.json', wrench = require('wrench'), + utils = require('../../../lib/utils'), fs = require('fs'), + path = require('path'), + configPath = path.join(utils.getCordovaDir(), 'blackberry10.json'), flag = false, + testAppCreated = false, _stdout = "", _stderr = ""; @@ -40,29 +44,35 @@ function executeScript(shellCommand) { describe("cordova/target tests", function () { beforeEach(function () { - executeScript("bin/create " + appFolder); - waitsFor(function () { - return flag; - },9000); - runs(function () { - flag = false; - }); + utils.copyFile(configPath, path.join(utils.getCordovaDir(), "bb10bak")); + fs.unlinkSync(configPath); + if (!testAppCreated) { + executeScript("bin/create " + appFolder); + waitsFor(function () { + return flag; + },9000); + runs(function () { + testAppCreated = true; + flag = false; + }); + } }); afterEach(function () { - wrench.rmdirSyncRecursive(tempFolder); + utils.copyFile(path.join(utils.getCordovaDir(), "bb10bak", "blackberry10.json"), path.join(utils.getCordovaDir())); + wrench.rmdirSyncRecursive(path.join(utils.getCordovaDir(), "bb10bak")); }); it("should add a target", function () { var project, target; - executeScript(appFolder + "cordova/target add z10 169.254.0.1 device -p pass --pin DEADBEEF"); + executeScript(appFolder + "cordova/target add z10 169.254.0.1 -t device -p pass --pin DEADBEEF"); waitsFor(function () { return flag; }); runs(function () { flag = false; - project = JSON.parse(fs.readFileSync(appFolder + projectFile, 'utf-8')); + project = JSON.parse(fs.readFileSync(configPath, 'utf-8')); expect(project.defaultTarget).toEqual("z10"); expect(Object.keys(project.targets).length).toEqual(1); target = project.targets.z10; @@ -77,7 +87,7 @@ describe("cordova/target tests", function () { it("should remove a target", function () { var project; - executeScript(appFolder + "cordova/target add z10 169.254.0.1 device -p pass --pin DEADBEEF"); + executeScript(appFolder + "cordova/target add z10 169.254.0.1 -t device -p pass --pin DEADBEEF"); waitsFor(function () { return flag; }); @@ -89,7 +99,7 @@ describe("cordova/target tests", function () { }); runs(function () { flag = false; - project = JSON.parse(fs.readFileSync(appFolder + projectFile, 'utf-8')); + project = JSON.parse(fs.readFileSync(configPath, 'utf-8')); expect(project.defaultTarget).toEqual(""); expect(Object.keys(project.targets).length).toEqual(0); expect(_stdout).toEqual("Deleting default target, please set a new default target"); @@ -100,13 +110,13 @@ describe("cordova/target tests", function () { it("should set default target", function () { var project; - executeScript(appFolder + "cordova/target add z10 169.254.0.1 device -p pass --pin DEADBEEF"); + executeScript(appFolder + "cordova/target add z10 169.254.0.1 -t device -p pass --pin DEADBEEF"); waitsFor(function () { return flag; }); runs(function () { flag = false; - executeScript(appFolder + "cordova/target add q10 169.254.0.2 device -p p455w02D --pin FACEFACE"); + executeScript(appFolder + "cordova/target add q10 169.254.0.2 -t device -p p455w02D --pin FACEFACE"); waitsFor(function () { return flag; }); @@ -118,7 +128,7 @@ describe("cordova/target tests", function () { }); runs(function () { flag = false; - project = JSON.parse(fs.readFileSync(appFolder + projectFile, 'utf-8')); + project = JSON.parse(fs.readFileSync(configPath, 'utf-8')); expect(project.defaultTarget).toEqual("q10"); }); }); @@ -126,13 +136,13 @@ describe("cordova/target tests", function () { }); it("should list targets", function () { - executeScript(appFolder + "cordova/target add z10 169.254.0.1 device -p pass --pin DEADBEEF"); + executeScript(appFolder + "cordova/target add z10 169.254.0.1 -t device -p pass --pin DEADBEEF"); waitsFor(function () { return flag; }); runs(function () { flag = false; - executeScript(appFolder + "cordova/target add q10 169.254.0.2 device -p p455w02D --pin FACEFACE"); + executeScript(appFolder + "cordova/target add q10 169.254.0.2 -t device -p p455w02D --pin FACEFACE"); waitsFor(function () { return flag; }); @@ -212,7 +222,13 @@ describe("cordova/target tests", function () { }); it("should warn invalid pin", function () { - executeScript(appFolder + "cordova/target add z10 169.254.0.1 device --pin NOTAPIN!"); + + //keep this in last test to remove test app + this.after(function() { + wrench.rmdirSyncRecursive(tempFolder); + }); + + executeScript(appFolder + "cordova/target add z10 169.254.0.1 -t device --pin NOTAPIN!"); waitsFor(function () { return flag; }); http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js index bcbe5d8..ee6091b 100644 --- a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js +++ b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js @@ -101,18 +101,6 @@ describe("Native packager", function () { expect(logger.warn).not.toHaveBeenCalled(); }); - it("shows debug token warning when debug token not a .bar file", function () { - spyOn(pkgrUtils, "writeFile"); - spyOn(logger, "warn"); - - session.debug = true; - //Current time will ensure that the file doesn't exist. - session.conf.DEBUG_TOKEN = new Date().getTime() + ".xyz"; - - nativePkgr.exec(session, target, testData.config, callback); - expect(logger.warn).toHaveBeenCalledWith(localize.translate("EXCEPTION_DEBUG_TOKEN_WRONG_FILE_EXTENSION")); - }); - it("exec blackberry-nativepackager", function () { var bbTabletXML = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<qnx><id>" + config.id + "</id>" + http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/bin/test/plugins/Device/index.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/test/plugins/Device/index.js b/blackberry10/bin/test/plugins/Device/index.js index 4c5fb29..09d9135 100644 --- a/blackberry10/bin/test/plugins/Device/index.js +++ b/blackberry10/bin/test/plugins/Device/index.js @@ -61,7 +61,6 @@ describe("Device", function () { expect(deviceInfo.platform).toEqual("blackberry10"); expect(deviceInfo.version).toEqual(mockedDevice.scmBundle); expect(deviceInfo.model).toEqual(mockedDevice.modelName); - expect(deviceInfo.name).toEqual(mockedDevice.modelName); expect(deviceInfo.uuid).toEqual(mockedDevice.devicePin); expect(deviceInfo.cordova).toBeDefined(); }); http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ff617f46/blackberry10/scripts/test.js ---------------------------------------------------------------------- diff --git a/blackberry10/scripts/test.js b/blackberry10/scripts/test.js index 1b2ce63..c1b70c2 100644 --- a/blackberry10/scripts/test.js +++ b/blackberry10/scripts/test.js @@ -17,6 +17,7 @@ module.exports = function (done, custom) { var jasmine = require('jasmine-node'), fs = require('fs'), + utils = require('./lib/utils'), specs = (custom !== null && fs.existsSync(custom)) ? [custom] : [ "framework/test", @@ -24,7 +25,7 @@ module.exports = function (done, custom) { "bin/test/cordova/unit", "bin/test/plugins" ]; - //console.log(specs); + utils.copyFile('bin/lib/utils.js', 'bin/templates/project/cordova/lib/', '../'); jasmine.executeSpecsInFolder({ 'specFolders': specs, 'onComplete': function (runner) {
