You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/09/23 19:58:58 UTC
[2/2] git commit: Refactor to use Q.js promises in place of callbacks
everywhere.
Refactor to use Q.js promises in place of callbacks everywhere.
This significantly cleans up many parts of the code, and generally
shortens it by 25%, by dropping redundant error checks.
NOTE: This DOES NOT change the "public" API of plugman, in the sense
that plugman.foo still takes a callback. Under the hood, it wraps a call
to plugman.raw.foo. If you downstream plugman and require modules like
fetch directly, (a) stop, and (b) you'll have to port to promises.
I created the cordova-3.1.x branch for all bugfixes for the 3.1.0
release, since this code should probably bake for a while before being
released to npm.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/32e28c96
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/32e28c96
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/32e28c96
Branch: refs/heads/master
Commit: 32e28c9667a3149be0e233ab67f01945626c041c
Parents: 308a94f
Author: Braden Shepherdson <br...@gmail.com>
Authored: Mon Sep 9 12:14:52 2013 -0400
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Mon Sep 23 13:54:24 2013 -0400
----------------------------------------------------------------------
main.js | 6 +-
package.json | 1 +
plugman.js | 95 +++++++---
spec/adduser.spec.js | 7 +-
spec/config.spec.js | 7 +-
spec/fetch.spec.js | 130 ++++++++++---
spec/info.spec.js | 9 +-
spec/install.spec.js | 271 ++++++++++++++++++++-------
spec/owner.spec.js | 7 +-
spec/platforms/android.spec.js | 3 +-
spec/platforms/windows8.spec.js | 3 +-
spec/platforms/wp7.spec.js | 3 +-
spec/platforms/wp8.spec.js | 3 +-
spec/publish.spec.js | 5 +-
spec/registry/registry.spec.js | 109 +++++++----
spec/search.spec.js | 5 +-
spec/uninstall.spec.js | 180 ++++++++++++------
spec/unpublish.spec.js | 5 +-
spec/util/action-stack.spec.js | 23 ++-
spec/util/plugins.spec.js | 47 +++--
spec/wrappers.spec.js | 39 ++++
src/adduser.js | 14 +-
src/config.js | 14 +-
src/fetch.js | 45 ++---
src/info.js | 19 +-
src/install.js | 346 +++++++++++++++++------------------
src/owner.js | 19 +-
src/prepare.js | 2 +-
src/publish.js | 14 +-
src/registry/manifest.js | 34 ++--
src/registry/registry.js | 203 ++++++++++----------
src/search.js | 14 +-
src/uninstall.js | 100 +++++-----
src/unpublish.js | 14 +-
src/util/action-stack.js | 9 +-
src/util/plugins.js | 77 ++++----
36 files changed, 1100 insertions(+), 782 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/main.js
----------------------------------------------------------------------
diff --git a/main.js b/main.js
index 47e63c6..57dcc69 100755
--- a/main.js
+++ b/main.js
@@ -24,6 +24,7 @@ var path = require('path')
, package = require(path.join(__dirname, 'package'))
, nopt = require('nopt')
, plugins = require('./src/util/plugins')
+ , Q = require('q'),
, plugman = require('./plugman');
var known_opts = { 'platform' : [ 'ios', 'android', 'blackberry10', 'wp7', 'wp8' , 'windows8', 'firefoxos' ]
@@ -72,7 +73,10 @@ if (cli_opts.version) {
} else if (cli_opts.help) {
console.log(plugman.help());
} else if (plugman.commands[cmd]) {
- plugman.commands[cmd](cli_opts);
+ var result = plugman.commands[cmd](cli_opts);
+ if (result && Q.isPromise(result)) {
+ result.done();
+ }
} else {
console.log(plugman.help());
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index fbf19e9..8cb7c56 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
"underscore":"1.4.4",
"dep-graph":"1.1.0",
"semver": "2.0.x",
+ "q": "~0.9",
"npm": "1.3.4",
"rc": "0.3.0",
"tar.gz": "0.1.1"
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/plugman.js
----------------------------------------------------------------------
diff --git a/plugman.js b/plugman.js
index 625933d..a7ff484 100755
--- a/plugman.js
+++ b/plugman.js
@@ -21,9 +21,31 @@
var emitter = require('./src/events');
-function addProperty(o, symbol, modulePath) {
+function addProperty(o, symbol, modulePath, doWrap) {
var val = null;
- Object.defineProperty(o, symbol, {
+
+ if (doWrap) {
+ o[symbol] = function() {
+ val = val || require(modulePath);
+ if (arguments.length && typeof arguments[arguments.length - 1] === 'function') {
+ // If args exist and the last one is a function, it's the callback.
+ var args = Array.prototype.slice.call(arguments);
+ var cb = args.pop();
+ val.apply(o, args).done(cb, cb);
+ } else {
+ val.apply(o, arguments).done(null, function(err){ throw err; });
+ }
+ };
+ } else {
+ // The top-level plugman.foo
+ Object.defineProperty(o, symbol, {
+ get : function() { return val = val || require(modulePath); },
+ set : function(v) { val = v; }
+ });
+ }
+
+ // The plugman.raw.foo
+ Object.defineProperty(o.raw, symbol, {
get : function() { return val = val || require(modulePath); },
set : function(v) { val = v; }
});
@@ -33,25 +55,29 @@ plugman = {
on: emitter.addListener,
off: emitter.removeListener,
removeAllListeners: emitter.removeAllListeners,
- emit: emitter.emit
+ emit: emitter.emit,
+ raw: {}
};
addProperty(plugman, 'help', './src/help');
-addProperty(plugman, 'install', './src/install');
-addProperty(plugman, 'uninstall', './src/uninstall');
-addProperty(plugman, 'fetch', './src/fetch');
+addProperty(plugman, 'install', './src/install', true);
+addProperty(plugman, 'uninstall', './src/uninstall', true);
+addProperty(plugman, 'fetch', './src/fetch', true);
addProperty(plugman, 'prepare', './src/prepare');
-addProperty(plugman, 'config', './src/config');
-addProperty(plugman, 'owner', './src/owner');
-addProperty(plugman, 'adduser', './src/adduser');
-addProperty(plugman, 'publish', './src/publish');
-addProperty(plugman, 'unpublish', './src/unpublish');
-addProperty(plugman, 'search', './src/search');
-addProperty(plugman, 'info', './src/info');
+addProperty(plugman, 'config', './src/config', true);
+addProperty(plugman, 'owner', './src/owner', true);
+addProperty(plugman, 'adduser', './src/adduser', true);
+addProperty(plugman, 'publish', './src/publish', true);
+addProperty(plugman, 'unpublish', './src/unpublish', true);
+addProperty(plugman, 'search', './src/search', true);
+addProperty(plugman, 'info', './src/info', true);
addProperty(plugman, 'config_changes', './src/util/config-changes');
plugman.commands = {
'config' : function(cli_opts) {
- plugman.config(cli_opts.argv.remain);
+ plugman.config(cli_opts.argv.remain, function(err) {
+ if (err) throw err;
+ else console.log('done');
+ });
},
'owner' : function(cli_opts) {
plugman.owner(cli_opts.argv.remain);
@@ -73,23 +99,44 @@ plugman.commands = {
cli_variables: cli_variables,
www_dir: cli_opts.www
};
- plugman.install(cli_opts.platform, cli_opts.project, cli_opts.plugin, cli_opts.plugins_dir, opts);
+ return plugman.install(cli_opts.platform, cli_opts.project, cli_opts.plugin, cli_opts.plugins_dir, opts);
},
'uninstall': function(cli_opts) {
if(!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
return console.log(plugman.help());
}
- plugman.uninstall(cli_opts.platform, cli_opts.project, cli_opts.plugin, cli_opts.plugins_dir, { www_dir: cli_opts.www });
+ return plugman.uninstall(cli_opts.platform, cli_opts.project, cli_opts.plugin, cli_opts.plugins_dir, { www_dir: cli_opts.www });
},
'adduser' : function(cli_opts) {
- plugman.adduser();
+ plugman.adduser(function(err) {
+ if (err) throw err;
+ else console.log('user added');
+ });
},
'search' : function(cli_opts) {
- plugman.search(cli_opts.argv.remain);
+ plugman.search(cli_opts.argv.remain, function(err, plugins) {
+ if (err) throw err;
+ else {
+ for(var plugin in plugins) {
+ console.log(plugins[plugin].name, '-', plugins[plugin].description || 'no description provided');
+ }
+ }
+ });
},
'info' : function(cli_opts) {
- plugman.info(cli_opts.argv.remain);
+ plugman.info(cli_opts.argv.remain, function(err, plugin_info) {
+ if (err) throw err;
+ else {
+ console.log('name:', plugin_info.name);
+ console.log('version:', plugin_info.version);
+ if (plugin_info.engines) {
+ for(var i = 0, j = plugin_info.engines.length ; i < j ; i++) {
+ console.log(plugin_info.engines[i].name, 'version:', plugin_info.engines[i].version);
+ }
+ }
+ }
+ });
},
'publish' : function(cli_opts) {
@@ -97,7 +144,10 @@ plugman.commands = {
if(!plugin_path) {
return console.log(plugman.help());
}
- plugman.publish(plugin_path);
+ plugman.publish(plugin_path, function(err) {
+ if (err) throw err;
+ else console.log('Plugin published');
+ });
},
'unpublish': function(cli_opts) {
@@ -105,7 +155,10 @@ plugman.commands = {
if(!plugin) {
return console.log(plugman.help());
}
- plugman.unpublish(plugin);
+ plugman.unpublish(plugin, function(err) {
+ if (err) throw err;
+ else console.log('Plugin unpublished');
+ });
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/adduser.spec.js
----------------------------------------------------------------------
diff --git a/spec/adduser.spec.js b/spec/adduser.spec.js
index 732ee71..48b1281 100644
--- a/spec/adduser.spec.js
+++ b/spec/adduser.spec.js
@@ -1,10 +1,11 @@
var adduser = require('../src/adduser'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('adduser', function() {
it('should add a user', function() {
- var sAddUser = spyOn(registry, 'adduser');
- adduser(function(err, result) { });
- expect(sAddUser).toHaveBeenCalledWith(null, jasmine.any(Function));
+ var sAddUser = spyOn(registry, 'adduser').andReturn(Q());
+ adduser();
+ expect(sAddUser).toHaveBeenCalled();
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/config.spec.js
----------------------------------------------------------------------
diff --git a/spec/config.spec.js b/spec/config.spec.js
index fe54636..65addbf 100644
--- a/spec/config.spec.js
+++ b/spec/config.spec.js
@@ -1,11 +1,12 @@
var config = require('../src/config'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('config', function() {
it('should run config', function() {
- var sConfig = spyOn(registry, 'config');
+ var sConfig = spyOn(registry, 'config').andReturn(Q());
var params = ['set', 'registry', 'http://registry.cordova.io'];
- config(params, function(err, result) { });
- expect(sConfig).toHaveBeenCalledWith(params, jasmine.any(Function));
+ config(params);
+ expect(sConfig).toHaveBeenCalledWith(params);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/fetch.spec.js
----------------------------------------------------------------------
diff --git a/spec/fetch.spec.js b/spec/fetch.spec.js
index 29233d3..b28815a 100644
--- a/spec/fetch.spec.js
+++ b/spec/fetch.spec.js
@@ -9,9 +9,16 @@ var fetch = require('../src/fetch'),
test_plugin = path.join(__dirname, 'plugins', 'ChildBrowser'),
test_plugin_with_space = path.join(__dirname, 'folder with space', 'plugins', 'ChildBrowser'),
plugins = require('../src/util/plugins'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('fetch', function() {
+ function wrapper(p, done, post) {
+ p.then(post, function(err) {
+ expect(err).toBeUndefined();
+ }).fin(done);
+ }
+
describe('local plugins', function() {
var xml, rm, sym, mkdir, cp, save_metadata;
beforeEach(function() {
@@ -24,76 +31,139 @@ describe('fetch', function() {
cp = spyOn(shell, 'cp');
save_metadata = spyOn(metadata, 'save_fetch_metadata');
});
- it('should copy locally-available plugin to plugins directory', function() {
- fetch(test_plugin, temp);
- expect(cp).toHaveBeenCalledWith('-R', path.join(test_plugin, '*'), path.join(temp, 'id'));
+
+ it('should copy locally-available plugin to plugins directory', function(done) {
+ wrapper(fetch(test_plugin, temp), done, function() {
+ expect(cp).toHaveBeenCalledWith('-R', path.join(test_plugin, '*'), path.join(temp, 'id'));
+ });
});
- it('should copy locally-available plugin to plugins directory when spaces in path', function() {
+ it('should copy locally-available plugin to plugins directory when spaces in path', function(done) {
//XXX: added this because plugman tries to fetch from registry when plugin folder does not exist
spyOn(fs,'existsSync').andReturn(true);
- fetch(test_plugin_with_space, temp);
- expect(cp).toHaveBeenCalledWith('-R', path.join(test_plugin_with_space, '*'), path.join(temp, 'id'));
+ wrapper(fetch(test_plugin_with_space, temp), done, function() {
+ expect(cp).toHaveBeenCalledWith('-R', path.join(test_plugin_with_space, '*'), path.join(temp, 'id'));
+ });
});
- it('should create a symlink if used with `link` param', function() {
- fetch(test_plugin, temp, { link: true });
- expect(sym).toHaveBeenCalledWith(test_plugin, path.join(temp, 'id'), 'dir');
+ it('should create a symlink if used with `link` param', function(done) {
+ wrapper(fetch(test_plugin, temp, { link: true }), done, function() {
+ expect(sym).toHaveBeenCalledWith(test_plugin, path.join(temp, 'id'), 'dir');
+ });
});
});
describe('git plugins', function() {
- var clone;
+ var clone, save_metadata, done;
+
+ function fetchPromise(f) {
+ f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
- clone = spyOn(plugins, 'clonePluginGitRepo');
+ clone = spyOn(plugins, 'clonePluginGitRepo').andReturn(Q('somedir'));
+ save_metadata = spyOn(metadata, 'save_fetch_metadata');
+ done = false;
});
it('should call clonePluginGitRepo for https:// and git:// based urls', function() {
var url = "https://github.com/bobeast/GAPlugin.git";
- fetch(url, temp);
- expect(clone).toHaveBeenCalledWith(url, temp, '.', undefined, jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(clone).toHaveBeenCalledWith(url, temp, '.', undefined);
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should call clonePluginGitRepo with subdir if applicable', function() {
var url = "https://github.com/bobeast/GAPlugin.git";
var dir = 'fakeSubDir';
- fetch(url, temp, { subdir: dir });
- expect(clone).toHaveBeenCalledWith(url, temp, dir, undefined, jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp, { subdir: dir }));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(clone).toHaveBeenCalledWith(url, temp, dir, undefined);
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should call clonePluginGitRepo with subdir and git ref if applicable', function() {
var url = "https://github.com/bobeast/GAPlugin.git";
var dir = 'fakeSubDir';
var ref = 'fakeGitRef';
- fetch(url, temp, { subdir: dir, git_ref: ref });
- expect(clone).toHaveBeenCalledWith(url, temp, dir, ref, jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp, { subdir: dir, git_ref: ref }));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(clone).toHaveBeenCalledWith(url, temp, dir, ref);
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should extract the git ref from the URL hash, if provided', function() {
var url = "https://github.com/bobeast/GAPlugin.git#fakeGitRef";
var baseURL = "https://github.com/bobeast/GAPlugin.git";
- fetch(url, temp, {});
- expect(clone).toHaveBeenCalledWith(baseURL, temp, '.', 'fakeGitRef', jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp, {}));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(clone).toHaveBeenCalledWith(baseURL, temp, '.', 'fakeGitRef');
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should extract the subdir from the URL hash, if provided', function() {
var url = "https://github.com/bobeast/GAPlugin.git#:fakeSubDir";
var baseURL = "https://github.com/bobeast/GAPlugin.git";
- fetch(url, temp, {});
- expect(clone).toHaveBeenCalledWith(baseURL, temp, 'fakeSubDir', undefined, jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp, {}));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(clone).toHaveBeenCalledWith(baseURL, temp, 'fakeSubDir', undefined);
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should extract the git ref and subdir from the URL hash, if provided', function() {
var url = "https://github.com/bobeast/GAPlugin.git#fakeGitRef:/fake/Sub/Dir/";
var baseURL = "https://github.com/bobeast/GAPlugin.git";
- fetch(url, temp, {});
- expect(clone).toHaveBeenCalledWith(baseURL, temp, 'fake/Sub/Dir', 'fakeGitRef', jasmine.any(Function));
+ runs(function() {
+ fetchPromise(fetch(url, temp, {}));
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(clone).toHaveBeenCalledWith(baseURL, temp, 'fake/Sub/Dir', 'fakeGitRef');
+ expect(save_metadata).toHaveBeenCalledWith('somedir', jasmine.any(Object));
+ });
});
it('should throw if used with url and `link` param', function() {
- expect(function() {
- fetch("https://github.com/bobeast/GAPlugin.git", temp, {link:true});
- }).toThrow('--link is not supported for git URLs');
+ runs(function() {
+ fetch("https://github.com/bobeast/GAPlugin.git", temp, {link:true}).then(null, function(err) { done = err; });
+ });
+ waitsFor(function() { return done; }, 'fetch promise never resolved', 250);
+ runs(function() {
+ expect(done).toEqual(new Error('--link is not supported for git URLs'));
+ });
});
});
describe('registry plugins', function() {
var pluginId = 'dummyplugin', sFetch;
+ var xml, rm, sym, mkdir, cp, save_metadata;
beforeEach(function() {
- sFetch = spyOn(registry, 'fetch');
+ xml = spyOn(xml_helpers, 'parseElementtreeSync').andReturn({
+ getroot:function() { return {attrib:{id:'id'}};}
+ });
+ rm = spyOn(shell, 'rm');
+ sym = spyOn(fs, 'symlinkSync');
+ mkdir = spyOn(shell, 'mkdir');
+ cp = spyOn(shell, 'cp');
+ save_metadata = spyOn(metadata, 'save_fetch_metadata');
+ sFetch = spyOn(registry, 'fetch').andReturn(Q('somedir'));
});
- it('should get a plugin from registry and set the right client when argument is not a folder nor URL', function() {
- fetch(pluginId, temp, {client: 'plugman'})
- expect(sFetch).toHaveBeenCalledWith([pluginId], 'plugman', jasmine.any(Function));
+
+ it('should get a plugin from registry and set the right client when argument is not a folder nor URL', function(done) {
+ wrapper(fetch(pluginId, temp, {client: 'plugman'}), done, function() {
+ expect(sFetch).toHaveBeenCalledWith([pluginId], 'plugman');
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/info.spec.js
----------------------------------------------------------------------
diff --git a/spec/info.spec.js b/spec/info.spec.js
index 1327c65..96256c7 100644
--- a/spec/info.spec.js
+++ b/spec/info.spec.js
@@ -1,10 +1,15 @@
var search = require('../src/info'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('info', function() {
it('should show plugin info', function() {
- var sSearch = spyOn(registry, 'info');
+ var sSearch = spyOn(registry, 'info').andReturn(Q({
+ name: 'fakePlugin',
+ version: '1.0.0',
+ engines: [{ name: 'plugman', version: '>=0.11' }]
+ }));
search(new Array('myplugin'));
- expect(sSearch).toHaveBeenCalledWith(['myplugin'], jasmine.any(Function));
+ expect(sSearch).toHaveBeenCalledWith(['myplugin']);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/install.spec.js
----------------------------------------------------------------------
diff --git a/spec/install.spec.js b/spec/install.spec.js
index 84efd96..9214e61 100644
--- a/spec/install.spec.js
+++ b/spec/install.spec.js
@@ -7,6 +7,7 @@ var install = require('../src/install'),
os = require('osenv'),
path = require('path'),
shell = require('shelljs'),
+ child_process = require('child_process'),
semver = require('semver'),
temp = __dirname,
dummyplugin = 'DummyPlugin',
@@ -14,19 +15,28 @@ var install = require('../src/install'),
variableplugin = 'VariablePlugin',
engineplugin = 'EnginePlugin',
childplugin = 'ChildBrowser',
+ Q = require('q'),
plugins_dir = path.join(temp, 'plugins');
describe('install', function() {
- var exists, get_json, chmod, exec, proc, add_to_queue, prepare, actions_push, c_a, mkdir;
+ var exists, get_json, chmod, exec, proc, add_to_queue, prepare, actions_push, c_a, mkdir, done;
+
+ function installPromise(f) {
+ f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
- proc = spyOn(actions.prototype, 'process').andCallFake(function(platform, proj, cb) {
- cb();
+ proc = spyOn(actions.prototype, 'process').andCallFake(function(platform, proj) {
+ return Q();
});
mkdir = spyOn(shell, 'mkdir');
actions_push = spyOn(actions.prototype, 'push');
c_a = spyOn(actions.prototype, 'createAction');
prepare = spyOn(plugman, 'prepare');
- exec = spyOn(shell, 'exec').andReturn({code:1});
+ exec = spyOn(child_process, 'exec').andCallFake(function(cmd, options, cb) {
+ if (!cb) cb = options;
+ cb(false, '', '');
+ });
chmod = spyOn(fs, 'chmodSync');
exists = spyOn(fs, 'existsSync').andReturn(true);
get_json = spyOn(config_changes, 'get_platform_json').andReturn({
@@ -34,22 +44,40 @@ describe('install', function() {
dependent_plugins:{}
});
add_to_queue = spyOn(config_changes, 'add_installed_plugin_to_prepare_queue');
+ done = false;
});
describe('success', function() {
it('should call prepare after a successful install', function() {
- install('android', temp, dummyplugin, plugins_dir, {});
- expect(prepare).toHaveBeenCalled();
+ runs(function() {
+ installPromise(install('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(prepare).toHaveBeenCalled();
+ });
});
it('should call fetch if provided plugin cannot be resolved locally', function() {
- var s = spyOn(plugman, 'fetch');
+ fetchSpy = spyOn(plugman.raw, 'fetch').andReturn(Q(path.join(plugins_dir, dummyplugin)));
exists.andReturn(false);
- install('android', temp, 'CLEANYOURSHORTS', plugins_dir, {});
- expect(s).toHaveBeenCalled();
+ runs(function() {
+ installPromise(install('android', temp, 'CLEANYOURSHORTS', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fetchSpy).toHaveBeenCalled();
+ });
});
it('should call the config-changes module\'s add_installed_plugin_to_prepare_queue method after processing an install', function() {
- install('android', temp, dummyplugin, plugins_dir, {});
- expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', {}, true);
+ runs(function() {
+ installPromise(install('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', {}, true);
+ });
});
it('should notify if plugin is already installed into project', function() {
var spy = spyOn(plugman, 'emit');
@@ -64,126 +92,227 @@ describe('install', function() {
});
it('should check version if plugin has engine tag', function(){
var spy = spyOn(semver, 'satisfies').andReturn(true);
- exec.andReturn({code:0,output:"2.5.0"});
- install('android', temp, 'engineplugin', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith('2.5.0','>=2.3.0');
+ exec.andCallFake(function(cmd, cb) {
+ cb(null, '2.5.0\n', '');
+ });
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('2.5.0','>=2.3.0');
+ });
});
it('should check version and munge it a little if it has "rc" in it so it plays nice with semver (introduce a dash in it)', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- exec.andReturn({code:0,output:"3.0.0rc1"});
- install('android', temp, 'engineplugin', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith('3.0.0-rc1','>=2.3.0');
+ exec.andCallFake(function(cmd, cb) {
+ cb(null, '3.0.0rc1\n');
+ });
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('3.0.0-rc1','>=2.3.0');
+ });
});
it('should check specific platform version over cordova version if specified', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- exec.andReturn({code:0,output:"3.1.0"});
- install('android', temp, 'enginepluginAndroid', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith('3.1.0','>=3.1.0');
+ exec.andCallFake(function(cmd, cb) {
+ cb(null, '3.1.0\n', '');
+ });
+ runs(function() {
+ installPromise(install('android', temp, 'enginepluginAndroid', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('3.1.0','>=3.1.0');
+ });
});
it('should check platform sdk version if specified', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- exec.andReturn({code:0,output:"4.3"});
- install('android', temp, 'enginepluginAndroid', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith('4.3','>=4.3');
+ exec.andCallFake(function(cmd, cb) {
+ cb(null, '4.3\n', '');
+ });
+ runs(function() {
+ installPromise(install('android', temp, 'enginepluginAndroid', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('4.3','>=4.3');
+ });
});
it('should check plugmans version', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- install('android', temp, 'engineplugin', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith(null,'>=0.10.0');
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('','>=0.10.0');
+ });
});
it('should check custom engine version', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- install('android', temp, 'engineplugin', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith(null,'>=1.0.0');
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('','>=1.0.0');
+ });
});
it('should check custom engine version that supports multiple platforms', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- install('android', temp, 'engineplugin', plugins_dir, {});
- expect(spy).toHaveBeenCalledWith(null,'>=3.0.0');
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).toHaveBeenCalledWith('','>=3.0.0');
+ });
});
it('should not check custom engine version that is not supported for platform', function() {
var spy = spyOn(semver, 'satisfies').andReturn(true);
- install('blackberry10', temp, 'engineplugin', plugins_dir, {});
- expect(spy).not.toHaveBeenCalledWith(null,'>=3.0.0');
+ runs(function() {
+ installPromise(install('blackberry10', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(spy).not.toHaveBeenCalledWith('','>=3.0.0');
+ });
});
it('should queue up actions as appropriate for that plugin and call process on the action stack', function() {
- install('android', temp, dummyplugin, plugins_dir, {});
- expect(actions_push.calls.length).toEqual(4);
- expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), temp, dummy_id]);
- expect(proc).toHaveBeenCalled();
+ runs(function() {
+ installPromise(install('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(actions_push.calls.length).toEqual(4);
+ expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), temp, dummy_id]);
+ expect(proc).toHaveBeenCalled();
+ });
});
it('should emit a results event with platform-agnostic <info>', function() {
var emit = spyOn(plugman, 'emit');
- install('android', temp, childplugin, plugins_dir, {});
- expect(emit).toHaveBeenCalledWith('results', 'No matter what platform you are installing to, this notice is very important.');
+ runs(function() {
+ installPromise(install('android', temp, childplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(emit).toHaveBeenCalledWith('results', 'No matter what platform you are installing to, this notice is very important.');
+ });
});
it('should emit a results event with platform-specific <info>', function() {
var emit = spyOn(plugman, 'emit');
- install('android', temp, childplugin, plugins_dir, {});
- expect(emit).toHaveBeenCalledWith('results', 'Please make sure you read this because it is very important to complete the installation of your plugin.');
+ runs(function() {
+ installPromise(install('android', temp, childplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(emit).toHaveBeenCalledWith('results', 'Please make sure you read this because it is very important to complete the installation of your plugin.');
+ });
});
it('should interpolate variables into <info> tags', function() {
var emit = spyOn(plugman, 'emit');
- install('android', temp, variableplugin, plugins_dir, {cli_variables:{API_KEY:'batman'}});
- expect(emit).toHaveBeenCalledWith('results', 'Remember that your api key is batman!');
+ runs(function() {
+ installPromise(install('android', temp, variableplugin, plugins_dir, {cli_variables:{API_KEY:'batman'}}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(emit).toHaveBeenCalledWith('results', 'Remember that your api key is batman!');
+ });
});
describe('with dependencies', function() {
it('should process all dependent plugins', function() {
// Plugin A depends on C & D
- install('android', temp, 'A', path.join(plugins_dir, 'dependencies'), {});
- // So process should be called 3 times
- expect(proc.calls.length).toEqual(3);
+ runs(function() {
+ installPromise(install('android', temp, 'A', path.join(plugins_dir, 'dependencies'), {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ // So process should be called 3 times
+ expect(proc.calls.length).toEqual(3);
+ });
});
it('should fetch any dependent plugins if missing', function() {
var deps_dir = path.join(plugins_dir, 'dependencies'),
- s = spyOn(plugman, 'fetch').andCallFake(function(id, dir, opts, cb) {
- cb(false, path.join(dir, id));
+ s = spyOn(plugman.raw, 'fetch').andCallFake(function(id, dir, opts) {
+ return Q(path.join(dir, id));
+ });
+ runs(function() {
+ exists.andReturn(false);
+ // Plugin A depends on C & D
+ install('android', temp, 'A', deps_dir, {});
+ });
+ waits(100);
+ runs(function() {
+ expect(s).toHaveBeenCalledWith('C', deps_dir, { link: false, subdir: undefined, git_ref: undefined, client: 'plugman' });
+ expect(s.calls.length).toEqual(3);
});
- exists.andReturn(false);
- // Plugin A depends on C & D
- install('android', temp, 'A', deps_dir, {});
- expect(s).toHaveBeenCalledWith('C', deps_dir, { link: false, subdir: undefined, git_ref: undefined, client: 'plugman'}, jasmine.any(Function));
- expect(s.calls.length).toEqual(3);
});
it('should try to fetch any dependent plugins from registry when url is not defined', function() {
var deps_dir = path.join(plugins_dir, 'dependencies'),
- s = spyOn(plugman, 'fetch').andCallFake(function(id, dir, opts, cb) {
- cb(false, path.join(dir, id));
- });
+ s = spyOn(plugman.raw, 'fetch').andCallFake(function(id, dir) {
+ return Q(path.join(dir,id));
+ });
exists.andReturn(false);
// Plugin A depends on C & D
- install('android', temp, 'E', deps_dir, {});
- expect(s).toHaveBeenCalledWith('D', deps_dir, { link: false, subdir: undefined, git_ref: undefined, client: 'plugman'}, jasmine.any(Function));
- expect(s.calls.length).toEqual(2);
+ runs(function() {
+ installPromise(install('android', temp, 'E', deps_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(s).toHaveBeenCalledWith('D', deps_dir, { link: false, subdir: undefined, git_ref: undefined, client: 'plugman' });
+ expect(s.calls.length).toEqual(2);
+ });
});
});
});
- describe('failure', function() {
+ xdescribe('failure', function() {
it('should throw if platform is unrecognized', function() {
- expect(function() {
- install('atari', temp, 'SomePlugin', plugins_dir, {});
- }).toThrow('atari not supported.');
+ runs(function() {
+ installPromise(install('atari', temp, 'SomePlugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('atari not supported.'));
+ });
});
it('should throw if variables are missing', function() {
- expect(function() {
- install('android', temp, variableplugin, plugins_dir, {});
- }).toThrow('Variable(s) missing: API_KEY');
+ runs(function() {
+ installPromise(install('android', temp, variableplugin, plugins_dir, {}));
+ });
+ waitsFor(function(){ return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('Variable(s) missing: API_KEY'));
+ });
});
it('should throw if git is not found on the path and a remote url is requested', function() {
exists.andReturn(false);
var which_spy = spyOn(shell, 'which').andReturn(null);
- expect(function() {
- install('android', temp, 'https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git', plugins_dir, {});
- }).toThrow('"git" command line tool is not installed: make sure it is accessible on your PATH.');
+ runs(function() {
+ installPromise(install('android', temp, 'https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera.git', plugins_dir, {}));
+ });
+ waitsFor(function(){ return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('"git" command line tool is not installed: make sure it is accessible on your PATH.'));
+ });
});
it('should throw if plugin version is less than the minimum requirement', function(){
var spy = spyOn(semver, 'satisfies').andReturn(false);
- exec.andReturn({code:0,output:"0.0.1"});
- expect(function() {
- install('android', temp, 'engineplugin', plugins_dir, {});
- }).toThrow('Plugin doesn\'t support this project\'s cordova version. cordova: 0.0.1, failed version requirement: >=2.3.0');
+ exec.andCallFake(function(cmd, cb) {
+ cb(null, '0.0.1\n', '');
+ });
+ runs(function() {
+ installPromise(install('android', temp, 'engineplugin', plugins_dir, {}));
+ });
+ waitsFor(function(){ return done; }, 'install promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('Plugin doesn\'t support this project\'s cordova version. cordova: 0.0.1, failed version requirement: >=2.3.0'));
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/owner.spec.js
----------------------------------------------------------------------
diff --git a/spec/owner.spec.js b/spec/owner.spec.js
index 3cc3c0a..1c6bd2c 100644
--- a/spec/owner.spec.js
+++ b/spec/owner.spec.js
@@ -1,11 +1,12 @@
var owner = require('../src/owner'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('owner', function() {
it('should run owner', function() {
- var sOwner = spyOn(registry, 'owner');
+ var sOwner = spyOn(registry, 'owner').andReturn(Q());
var params = ['add', 'anis', 'com.phonegap.plugins.dummyplugin'];
- owner(params, function(err, result) { });
- expect(sOwner).toHaveBeenCalledWith(params, jasmine.any(Function));
+ owner(params);
+ expect(sOwner).toHaveBeenCalledWith(params);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/platforms/android.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/android.spec.js b/spec/platforms/android.spec.js
index cafa730..fe91a53 100644
--- a/spec/platforms/android.spec.js
+++ b/spec/platforms/android.spec.js
@@ -126,7 +126,8 @@ describe('android project handler', function() {
describe('of <source-file> elements', function() {
it('should remove stuff by calling common.deleteJava', function(done) {
var s = spyOn(common, 'deleteJava');
- install('android', temp, dummyplugin, plugins_dir, {}, function() {
+ install('android', temp, dummyplugin, plugins_dir, {})
+ .then(function() {
var source = copyArray(valid_source);
android['source-file'].uninstall(source[0], temp);
expect(s).toHaveBeenCalledWith(temp, path.join('src', 'com', 'phonegap', 'plugins', 'dummyplugin', 'DummyPlugin.java'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/platforms/windows8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/windows8.spec.js b/spec/platforms/windows8.spec.js
index e1ca2cb..6764301 100644
--- a/spec/platforms/windows8.spec.js
+++ b/spec/platforms/windows8.spec.js
@@ -122,7 +122,8 @@ describe('windows8 project handler', function() {
describe('of <source-file> elements', function() {
it('should remove stuff by calling common.removeFile', function(done) {
var s = spyOn(common, 'removeFile');
- install('windows8', temp, dummyplugin, plugins_dir, {}, function() {
+ install('windows8', temp, dummyplugin, plugins_dir, {})
+ .then(function() {
var source = copyArray(valid_source);
windows8['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(temp, path.join('www', 'plugins', 'com.phonegap.plugins.dummyplugin', 'dummer.js'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/platforms/wp7.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp7.spec.js b/spec/platforms/wp7.spec.js
index 7a6808c..c085be4 100644
--- a/spec/platforms/wp7.spec.js
+++ b/spec/platforms/wp7.spec.js
@@ -116,7 +116,8 @@ describe('wp7 project handler', function() {
describe('of <source-file> elements', function() {
it('should remove stuff by calling common.removeFile', function(done) {
var s = spyOn(common, 'removeFile');
- install('wp7', temp, dummyplugin, plugins_dir, {}, function() {
+ install('wp7', temp, dummyplugin, plugins_dir, {})
+ .then(function() {
var source = copyArray(valid_source);
wp7['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/platforms/wp8.spec.js
----------------------------------------------------------------------
diff --git a/spec/platforms/wp8.spec.js b/spec/platforms/wp8.spec.js
index 2df2b67..398e567 100644
--- a/spec/platforms/wp8.spec.js
+++ b/spec/platforms/wp8.spec.js
@@ -116,7 +116,8 @@ describe('wp8 project handler', function() {
describe('of <source-file> elements', function() {
it('should remove stuff by calling common.removeFile', function(done) {
var s = spyOn(common, 'removeFile');
- install('wp8', temp, dummyplugin, plugins_dir, {}, function() {
+ install('wp8', temp, dummyplugin, plugins_dir, {})
+ .then(function() {
var source = copyArray(valid_source);
wp8['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
expect(s).toHaveBeenCalledWith(temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/publish.spec.js
----------------------------------------------------------------------
diff --git a/spec/publish.spec.js b/spec/publish.spec.js
index 59f863e..3498bd6 100644
--- a/spec/publish.spec.js
+++ b/spec/publish.spec.js
@@ -1,10 +1,11 @@
var publish = require('../src/publish'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('publish', function() {
it('should publish a plugin', function() {
- var sPublish = spyOn(registry, 'publish');
+ var sPublish = spyOn(registry, 'publish').andReturn(Q(['/path/to/my/plugin']));
publish(new Array('/path/to/myplugin'));
- expect(sPublish).toHaveBeenCalledWith(['/path/to/myplugin'], jasmine.any(Function));
+ expect(sPublish).toHaveBeenCalledWith(['/path/to/myplugin']);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/registry/registry.spec.js
----------------------------------------------------------------------
diff --git a/spec/registry/registry.spec.js b/spec/registry/registry.spec.js
index a4f0688..5cb8386 100644
--- a/spec/registry/registry.spec.js
+++ b/spec/registry/registry.spec.js
@@ -2,6 +2,7 @@ var registry = require('../../src/registry/registry'),
manifest = require('../../src/registry/manifest'),
fs = require('fs'),
path = require('path'),
+ Q = require('q'),
npm = require('npm');
describe('registry', function() {
@@ -21,77 +22,105 @@ describe('registry', function() {
expect(JSON.parse(fs.readFileSync(packageJson)).name).toEqual('com.cordova.engine');
expect(JSON.parse(fs.readFileSync(packageJson)).version).toEqual('1.0.0');
expect(JSON.parse(fs.readFileSync(packageJson)).engines).toEqual(
- [ { name : 'cordova', version : '>=2.3.0' }, { name : 'cordova-plugman', version : '>=0.10.0' }, { name : 'mega-fun-plugin', version : '>=1.0.0' }, { name : 'mega-boring-plugin', version : '>=3.0.0' } ]
+ [ { name : 'cordova', version : '>=2.3.0' }, { name : 'cordova-plugman', version : '>=0.10.0' }, { name : 'mega-fun-plugin', version : '>=1.0.0' }, { name : 'mega-boring-plugin', version : '>=3.0.0' } ]
);
});
});
describe('actions', function() {
+ var done, fakeLoad, fakeNPMCommands;
+
+ function registryPromise(f) {
+ return f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
+ done = false;
var fakeSettings = {
cache: '/some/cache/dir',
logstream: 'somelogstream@2313213',
userconfig: '/some/config/dir'
};
- var fakeNPMCommands = {
- config: function() {},
- adduser: function() {},
- publish: function() {},
- unpublish: function() {},
- search: function() {}
- }
+
+ var fakeNPM = function() {
+ if (arguments.length > 0) {
+ var cb = arguments[arguments.length-1];
+ if (cb && typeof cb === 'function') cb(null, true);
+ }
+ };
+
registry.settings = fakeSettings;
+ fakeLoad = spyOn(npm, 'load').andCallFake(function(settings, cb) { cb(null, true); });
+
+ fakeNPMCommands = {};
+ ['config', 'adduser', 'cache', 'publish', 'unpublish', 'search'].forEach(function(cmd) {
+ fakeNPMCommands[cmd] = jasmine.createSpy(cmd).andCallFake(fakeNPM);
+ });
+
npm.commands = fakeNPMCommands;
});
it('should run config', function() {
var params = ['set', 'registry', 'http://registry.cordova.io'];
- var sLoad = spyOn(npm, 'load').andCallFake(function(err, cb) {
- cb();
+ runs(function() {
+ registryPromise(registry.config(params));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fakeLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
+ expect(fakeNPMCommands.config).toHaveBeenCalledWith(params, jasmine.any(Function));
});
- var sConfig = spyOn(npm.commands, 'config');
- registry.config(params, function() {});
- expect(sLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
- expect(sConfig).toHaveBeenCalledWith(params, jasmine.any(Function));
});
it('should run adduser', function() {
- var sLoad = spyOn(npm, 'load').andCallFake(function(err, cb) {
- cb();
+ runs(function() {
+ registryPromise(registry.adduser(null));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fakeLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
+ expect(fakeNPMCommands.adduser).toHaveBeenCalledWith(null, jasmine.any(Function));
});
- var sAddUser = spyOn(npm.commands, 'adduser');
- registry.adduser(null, function() {});
- expect(sLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
- expect(sAddUser).toHaveBeenCalledWith(null, jasmine.any(Function));
});
it('should run publish', function() {
var params = [__dirname + '/../plugins/DummyPlugin'];
- var sLoad = spyOn(npm, 'load').andCallFake(function(err, cb) {
- cb();
+ var spyGenerate = spyOn(manifest, 'generatePackageJsonFromPluginXml').andReturn(Q());
+ var spyUnlink = spyOn(fs, 'unlink');
+ runs(function() {
+ registryPromise(registry.publish(params));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fakeLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
+ expect(spyGenerate).toHaveBeenCalledWith(params[0]);
+ expect(fakeNPMCommands.publish).toHaveBeenCalledWith(params, jasmine.any(Function));
+ expect(spyUnlink).toHaveBeenCalledWith(path.resolve(params[0], 'package.json'));
});
- var sPublish = spyOn(npm.commands, 'publish');
- var sGenerate = spyOn(manifest, 'generatePackageJsonFromPluginXml');
- registry.publish(params, function() {});
- expect(sLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
- expect(sGenerate).toHaveBeenCalledWith(params[0]);
- expect(sPublish).toHaveBeenCalledWith(params, jasmine.any(Function));
});
it('should run unpublish', function() {
var params = ['dummyplugin@0.6.0'];
- var sLoad = spyOn(npm, 'load').andCallFake(function(err, cb) {
- cb();
+ runs(function() {
+ registryPromise(registry.unpublish(params));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fakeLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
+ expect(fakeNPMCommands.unpublish).toHaveBeenCalledWith(params, jasmine.any(Function));
+ expect(fakeNPMCommands.cache).toHaveBeenCalledWith(['clean'], jasmine.any(Function));
});
- var sUnpublish = spyOn(npm.commands, 'unpublish');
- registry.unpublish(params, function() {});
- expect(sLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
- expect(sUnpublish).toHaveBeenCalledWith(params, jasmine.any(Function));
});
it('should run search', function() {
var params = ['dummyplugin', 'plugin'];
- var sLoad = spyOn(npm, 'load').andCallFake(function(err, cb) {
- cb();
+ runs(function() {
+ registryPromise(registry.search(params));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toBe(true);
+ expect(fakeLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
+ expect(fakeNPMCommands.search).toHaveBeenCalledWith(params, true, jasmine.any(Function));
});
- var sSearch = spyOn(npm.commands, 'search');
- registry.search(params, function() {});
- expect(sLoad).toHaveBeenCalledWith(registry.settings, jasmine.any(Function));
- expect(sSearch).toHaveBeenCalledWith(params, true, jasmine.any(Function));
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/search.spec.js
----------------------------------------------------------------------
diff --git a/spec/search.spec.js b/spec/search.spec.js
index 2393c70..4955d2d 100644
--- a/spec/search.spec.js
+++ b/spec/search.spec.js
@@ -1,10 +1,11 @@
var search = require('../src/search'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('search', function() {
it('should search a plugin', function() {
- var sSearch = spyOn(registry, 'search');
+ var sSearch = spyOn(registry, 'search').andReturn(Q());
search(new Array('myplugin', 'keyword'));
- expect(sSearch).toHaveBeenCalledWith(['myplugin', 'keyword'], jasmine.any(Function));
+ expect(sSearch).toHaveBeenCalledWith(['myplugin', 'keyword']);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/uninstall.spec.js
----------------------------------------------------------------------
diff --git a/spec/uninstall.spec.js b/spec/uninstall.spec.js
index 74ef25f..318caca 100644
--- a/spec/uninstall.spec.js
+++ b/spec/uninstall.spec.js
@@ -14,19 +14,22 @@ var uninstall = require('../src/uninstall'),
dummy_id = 'com.phonegap.plugins.dummyplugin',
variableplugin = 'VariablePlugin',
engineplugin = 'EnginePlugin',
+ Q = require('q'),
plugins_dir = path.join(temp, 'plugins');
describe('uninstallPlatform', function() {
- var exists, get_json, chmod, exec, proc, add_to_queue, prepare, actions_push, c_a, rm;
+ var exists, get_json, chmod, proc, add_to_queue, prepare, actions_push, c_a, rm, done;
var gen_deps, get_chain;
+
+ function uninstallPromise(f) {
+ return f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
- proc = spyOn(actions.prototype, 'process').andCallFake(function(platform, proj, cb) {
- cb();
- });
+ proc = spyOn(actions.prototype, 'process').andReturn(Q());
actions_push = spyOn(actions.prototype, 'push');
c_a = spyOn(actions.prototype, 'createAction');
prepare = spyOn(plugman, 'prepare');
- exec = spyOn(shell, 'exec').andReturn({code:1});
chmod = spyOn(fs, 'chmodSync');
exists = spyOn(fs, 'existsSync').andReturn(true);
get_json = spyOn(config_changes, 'get_platform_json').andReturn({
@@ -42,21 +45,37 @@ describe('uninstallPlatform', function() {
},
top_level_plugins:[]
});
+ done = false;
});
describe('success', function() {
it('should call prepare after a successful uninstall', function() {
- uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {});
- expect(prepare).toHaveBeenCalled();
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(prepare).toHaveBeenCalled();
+ });
});
it('should call the config-changes module\'s add_uninstalled_plugin_to_prepare_queue method after processing an install', function() {
- uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {});
- expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', true);
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', true);
+ });
});
it('should queue up actions as appropriate for that plugin and call process on the action stack', function() {
- uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {});
- expect(actions_push.calls.length).toEqual(4);
- expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id]);
- expect(proc).toHaveBeenCalled();
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(actions_push.calls.length).toEqual(4);
+ expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id]);
+ expect(proc).toHaveBeenCalled();
+ });
});
describe('with dependencies', function() {
@@ -95,8 +114,14 @@ describe('uninstallPlatform', function() {
}
return obj;
});
- uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {});
- expect(emit).toHaveBeenCalledWith('log', 'Uninstalling 2 dangling dependent plugins...');
+
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(emit).toHaveBeenCalledWith('log', 'Uninstalling 2 dangling dependent plugins...');
+ });
});
it('should not uninstall any dependencies that are relied on by other plugins');
});
@@ -104,30 +129,40 @@ describe('uninstallPlatform', function() {
describe('failure', function() {
it('should throw if platform is unrecognized', function() {
- expect(function() {
- uninstall.uninstallPlatform('atari', temp, 'SomePlugin', plugins_dir, {});
- }).toThrow('atari not supported.');
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('atari', temp, 'SomePlugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('atari not supported.'));
+ });
});
it('should throw if plugin is missing', function() {
exists.andReturn(false);
- expect(function() {
- uninstall.uninstallPlatform('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {});
- }).toThrow('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?');
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlatform('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?'));
+ });
});
});
});
describe('uninstallPlugin', function() {
- var exists, get_json, chmod, exec, proc, add_to_queue, prepare, actions_push, c_a, rm, uninstall_plugin;
+ var exists, get_json, chmod, proc, add_to_queue, prepare, actions_push, c_a, rm, uninstall_plugin, done;
+
+ function uninstallPromise(f) {
+ return f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
uninstall_plugin = spyOn(uninstall, 'uninstallPlugin').andCallThrough();
- proc = spyOn(actions.prototype, 'process').andCallFake(function(platform, proj, cb) {
- cb();
- });
+ proc = spyOn(actions.prototype, 'process').andReturn(Q());
actions_push = spyOn(actions.prototype, 'push');
c_a = spyOn(actions.prototype, 'createAction');
prepare = spyOn(plugman, 'prepare');
- exec = spyOn(shell, 'exec').andReturn({code:1});
chmod = spyOn(fs, 'chmodSync');
exists = spyOn(fs, 'existsSync').andReturn(true);
get_json = spyOn(config_changes, 'get_platform_json').andReturn({
@@ -136,11 +171,17 @@ describe('uninstallPlugin', function() {
});
rm = spyOn(shell, 'rm');
add_to_queue = spyOn(config_changes, 'add_uninstalled_plugin_to_prepare_queue');
+ done = false;
});
describe('success', function() {
it('should remove the plugin directory', function() {
- uninstall.uninstallPlugin(dummyplugin, plugins_dir);
- expect(rm).toHaveBeenCalled();
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlugin(dummyplugin, plugins_dir));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(rm).toHaveBeenCalled();
+ });
});
describe('with dependencies', function() {
var parseET, emit;
@@ -164,8 +205,13 @@ describe('uninstallPlugin', function() {
});
});
it('should recurse if dependent plugins are detected', function() {
- uninstall.uninstallPlugin(dummyplugin, plugins_dir);
- expect(uninstall_plugin).toHaveBeenCalledWith('somedependent', plugins_dir, jasmine.any(Function));
+ runs(function() {
+ uninstallPromise(uninstall.uninstallPlugin(dummyplugin, plugins_dir));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(uninstall_plugin).toHaveBeenCalledWith('somedependent', plugins_dir);
+ });
});
});
});
@@ -173,23 +219,29 @@ describe('uninstallPlugin', function() {
describe('failure', function() {
it('should throw if plugin is missing', function() {
exists.andReturn(false);
- expect(function() {
- uninstall('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {});
- }).toThrow('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?');
+ runs(function() {
+ uninstallPromise(uninstall('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?'));
+ });
});
});
});
describe('uninstall', function() {
- var exists, get_json, chmod, exec, proc, add_to_queue, prepare, actions_push, c_a, rm;
+ var exists, get_json, chmod, proc, add_to_queue, prepare, actions_push, c_a, rm, done;
+
+ function uninstallPromise(f) {
+ return f.then(function() { done = true; }, function(err) { done = err; });
+ }
+
beforeEach(function() {
- proc = spyOn(actions.prototype, 'process').andCallFake(function(platform, proj, cb) {
- cb();
- });
+ proc = spyOn(actions.prototype, 'process').andReturn(Q());
actions_push = spyOn(actions.prototype, 'push');
c_a = spyOn(actions.prototype, 'createAction');
prepare = spyOn(plugman, 'prepare');
- exec = spyOn(shell, 'exec').andReturn({code:1});
chmod = spyOn(fs, 'chmodSync');
exists = spyOn(fs, 'existsSync').andReturn(true);
get_json = spyOn(config_changes, 'get_platform_json').andReturn({
@@ -198,21 +250,37 @@ describe('uninstall', function() {
});
rm = spyOn(shell, 'rm');
add_to_queue = spyOn(config_changes, 'add_uninstalled_plugin_to_prepare_queue');
+ done = false;
});
describe('success', function() {
it('should call prepare after a successful uninstall', function() {
- uninstall('android', temp, dummyplugin, plugins_dir, {});
- expect(prepare).toHaveBeenCalled();
+ runs(function() {
+ uninstallPromise(uninstall('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(prepare).toHaveBeenCalled();
+ });
});
it('should call the config-changes module\'s add_uninstalled_plugin_to_prepare_queue method after processing an install', function() {
- uninstall('android', temp, dummyplugin, plugins_dir, {});
- expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', true);
+ runs(function() {
+ uninstallPromise(uninstall('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(add_to_queue).toHaveBeenCalledWith(plugins_dir, 'DummyPlugin', 'android', true);
+ });
});
it('should queue up actions as appropriate for that plugin and call process on the action stack', function() {
- uninstall('android', temp, dummyplugin, plugins_dir, {});
- expect(actions_push.calls.length).toEqual(4);
- expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id]);
- expect(proc).toHaveBeenCalled();
+ runs(function() {
+ uninstallPromise(uninstall('android', temp, dummyplugin, plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(actions_push.calls.length).toEqual(4);
+ expect(c_a).toHaveBeenCalledWith(jasmine.any(Function), [jasmine.any(Object), temp, dummy_id], jasmine.any(Function), [jasmine.any(Object), path.join(plugins_dir, dummyplugin), temp, dummy_id]);
+ expect(proc).toHaveBeenCalled();
+ });
});
describe('with dependencies', function() {
@@ -223,15 +291,23 @@ describe('uninstall', function() {
describe('failure', function() {
it('should throw if platform is unrecognized', function() {
- expect(function() {
- uninstall('atari', temp, 'SomePlugin', plugins_dir, {});
- }).toThrow('atari not supported.');
+ runs(function() {
+ uninstallPromise(uninstall('atari', temp, 'SomePlugin', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('atari not supported.'));
+ });
});
it('should throw if plugin is missing', function() {
exists.andReturn(false);
- expect(function() {
- uninstall('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {});
- }).toThrow('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?');
+ runs(function() {
+ uninstallPromise(uninstall('android', temp, 'SomePluginThatDoesntExist', plugins_dir, {}));
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(done).toEqual(new Error('Plugin "SomePluginThatDoesntExist" not found. Already uninstalled?'));
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/unpublish.spec.js
----------------------------------------------------------------------
diff --git a/spec/unpublish.spec.js b/spec/unpublish.spec.js
index f454a27..944f640 100644
--- a/spec/unpublish.spec.js
+++ b/spec/unpublish.spec.js
@@ -1,10 +1,11 @@
var unpublish = require('../src/unpublish'),
+ Q = require('q'),
registry = require('../src/registry/registry');
describe('unpublish', function() {
it('should unpublish a plugin', function() {
- var sUnpublish = spyOn(registry, 'unpublish');
+ var sUnpublish = spyOn(registry, 'unpublish').andReturn(Q());
unpublish(new Array('myplugin@0.0.1'));
- expect(sUnpublish).toHaveBeenCalledWith(['myplugin@0.0.1'], jasmine.any(Function));
+ expect(sUnpublish).toHaveBeenCalledWith(['myplugin@0.0.1']);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/util/action-stack.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/action-stack.spec.js b/spec/util/action-stack.spec.js
index f366407..8950240 100644
--- a/spec/util/action-stack.spec.js
+++ b/spec/util/action-stack.spec.js
@@ -39,15 +39,20 @@ describe('action-stack', function() {
stack.push(stack.createAction(second_spy, second_args, function(){}, []));
stack.push(stack.createAction(third_spy, third_args, function(){}, []));
// process should throw
- expect(function() {
- stack.process('android', 'blah');
- }).toThrow('Uh oh!\n' + process_err);
- // first two actions should have been called, but not the third
- expect(first_spy).toHaveBeenCalledWith(first_args[0]);
- expect(second_spy).toHaveBeenCalledWith(second_args[0]);
- expect(third_spy).not.toHaveBeenCalledWith(third_args[0]);
- // first reverter should have been called after second action exploded
- expect(first_reverter).toHaveBeenCalledWith(first_reverter_args[0]);
+ var error;
+ runs(function() {
+ stack.process('android', 'blah').fail(function(err) { error = err; });
+ });
+ waitsFor(function(){ return error; }, 'process promise never resolved', 500);
+ runs(function() {
+ expect(error).toEqual(new Error('Uh oh!\n' + process_err));
+ // first two actions should have been called, but not the third
+ expect(first_spy).toHaveBeenCalledWith(first_args[0]);
+ expect(second_spy).toHaveBeenCalledWith(second_args[0]);
+ expect(third_spy).not.toHaveBeenCalledWith(third_args[0]);
+ // first reverter should have been called after second action exploded
+ expect(first_reverter).toHaveBeenCalledWith(first_reverter_args[0]);
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/util/plugins.spec.js
----------------------------------------------------------------------
diff --git a/spec/util/plugins.spec.js b/spec/util/plugins.spec.js
index 7f569eb..63d0aac 100644
--- a/spec/util/plugins.spec.js
+++ b/spec/util/plugins.spec.js
@@ -23,16 +23,18 @@ var http = require('http'),
fs = require('fs'),
temp = path.join(osenv.tmpdir(), 'plugman'),
shell = require('shelljs'),
+ child_process = require('child_process'),
plugins = require('../../src/util/plugins'),
xml_helpers = require('../../src/util/xml-helpers');
describe('plugins utility module', function(){
describe('clonePluginGitRepo', function(){
var fake_id = 'VillageDrunkard';
- var execSpy, cp_spy, xml_spy;
+ var execSpy, cp_spy, xml_spy, done;
beforeEach(function() {
- execSpy = spyOn(shell, 'exec').andCallFake(function(cmd, opts, cb) {
- cb(0, 'git output');
+ execSpy = spyOn(child_process, 'exec').andCallFake(function(cmd, opts, cb) {
+ if (!cb) cb = opts;
+ cb(null, 'git output');
});
spyOn(shell, 'which').andReturn(true);
cp_spy = spyOn(shell, 'cp');
@@ -43,29 +45,38 @@ describe('plugins utility module', function(){
};
}
});
+ done = false;
});
it('should shell out to git clone with correct arguments', function(){
- var plugin_git_url = 'https://github.com/imhotep/ChildBrowser'
+ var plugin_git_url = 'https://github.com/imhotep/ChildBrowser';
var callback = jasmine.createSpy();
- plugins.clonePluginGitRepo(plugin_git_url, temp, '.', undefined, callback);
-
- expect(execSpy).toHaveBeenCalled();
- var git_clone_regex = new RegExp('^git clone "' + plugin_git_url + '" ".*"$', 'gi');
- expect(execSpy.mostRecentCall.args[0]).toMatch(git_clone_regex);
+ runs(function() {
+ plugins.clonePluginGitRepo(plugin_git_url, temp, '.', undefined)
+ .then(function(val) { done = val; }, function(err) { done = err; });
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ expect(execSpy).toHaveBeenCalled();
+ var git_clone_regex = new RegExp('^git clone "' + plugin_git_url + '" ".*"$', 'gi');
+ expect(execSpy.mostRecentCall.args[0]).toMatch(git_clone_regex);
- expect(callback).toHaveBeenCalled();
- expect(callback.mostRecentCall.args[0]).toBe(null);
- expect(callback.mostRecentCall.args[1]).toMatch(new RegExp(path.sep + fake_id + '$'));
+ expect(done).toMatch(new RegExp(path.sep + fake_id + '$'));
+ });
});
it('should take into account subdirectory argument when copying over final repository into plugins+plugin_id directory', function() {
- var plugin_git_url = 'https://github.com/imhotep/ChildBrowser'
-
+ var plugin_git_url = 'https://github.com/imhotep/ChildBrowser';
var fake_subdir = 'TheBrainRecoilsInHorror';
- plugins.clonePluginGitRepo(plugin_git_url, temp, fake_subdir);
- var expected_subdir_cp_path = new RegExp(fake_subdir + '[\\\\\\/]\\*$', 'gi');
- expect(cp_spy.mostRecentCall.args[1]).toMatch(expected_subdir_cp_path);
- expect(cp_spy.mostRecentCall.args[2]).toEqual(path.join(temp, fake_id));
+ runs(function() {
+ plugins.clonePluginGitRepo(plugin_git_url, temp, fake_subdir)
+ .then(function(val) { done = val || true; }, function(err) { done = err; });
+ });
+ waitsFor(function() { return done; }, 'promise never resolved', 500);
+ runs(function() {
+ var expected_subdir_cp_path = new RegExp(fake_subdir + '[\\\\\\/]\\*$', 'gi');
+ expect(cp_spy.mostRecentCall.args[1]).toMatch(expected_subdir_cp_path);
+ expect(cp_spy.mostRecentCall.args[2]).toEqual(path.join(temp, fake_id));
+ });
});
});
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/spec/wrappers.spec.js
----------------------------------------------------------------------
diff --git a/spec/wrappers.spec.js b/spec/wrappers.spec.js
new file mode 100644
index 0000000..c0727b9
--- /dev/null
+++ b/spec/wrappers.spec.js
@@ -0,0 +1,39 @@
+var Q = require('q'),
+ plugman = require('../plugman');
+
+describe('callback wrapper', function() {
+ var calls = ['install', 'uninstall', 'fetch', 'config', 'owner', 'adduser', 'publish', 'unpublish', 'search', 'info'];
+ for (var i = 0; i < calls.length; i++) {
+ var call = calls[i];
+
+ describe('`' + call + '`', function() {
+ var raw;
+ beforeEach(function() {
+ raw = spyOn(plugman.raw, call);
+ });
+
+ it('should work with no callback and success', function() {
+ raw.andReturn(Q());
+ plugman[call]();
+ expect(raw).toHaveBeenCalled();
+ });
+
+ it('should call the callback on success', function(done) {
+ raw.andReturn(Q());
+ plugman[call](function(err) {
+ expect(err).toBeUndefined();
+ done();
+ });
+ });
+
+ it('should call the callback with the error on failure', function(done) {
+ raw.andReturn(Q.reject(new Error('junk')));
+ plugman[call](function(err) {
+ expect(err).toEqual(new Error('junk'));
+ done();
+ });
+ });
+ });
+ }
+});
+
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/src/adduser.js
----------------------------------------------------------------------
diff --git a/src/adduser.js b/src/adduser.js
index 3ff5023..b83a676 100644
--- a/src/adduser.js
+++ b/src/adduser.js
@@ -1,15 +1,5 @@
var registry = require('./registry/registry')
-module.exports = function(callback) {
- registry.adduser(null, function(err) {
- if(callback && typeof callback === 'function') {
- err ? callback(err) : callback(null);
- } else {
- if(err) {
- throw err;
- } else {
- console.log('user added');
- }
- }
- });
+module.exports = function() {
+ return registry.adduser(null);
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/32e28c96/src/config.js
----------------------------------------------------------------------
diff --git a/src/config.js b/src/config.js
index f863717..e892425 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,15 +1,5 @@
var registry = require('./registry/registry')
-module.exports = function(params, callback) {
- registry.config(params, function(err) {
- if(callback && typeof callback === 'function') {
- err ? callback(err) : callback(null);
- } else {
- if(err) {
- throw err;
- } else {
- console.log('done');
- }
- }
- });
+module.exports = function(params) {
+ return registry.config(params)
}