merging latest
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/745b0d80 Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/745b0d80 Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/745b0d80 Branch: refs/heads/master Commit: 745b0d809a18f912a5298f798beb9df1b8578d3e Parents: f5158ec 8e57050 Author: Anis Kadri <[email protected]> Authored: Mon Jul 15 17:37:35 2013 -0700 Committer: Anis Kadri <[email protected]> Committed: Mon Jul 15 17:37:35 2013 -0700 ---------------------------------------------------------------------- cordova.js | 1 + package.json | 5 ++- spec/lazy_load.spec.js | 57 ++++++++------------------ spec/plugin.spec.js | 37 ++++++++++++++--- src/lazy_load.js | 91 +++++++++++------------------------------ src/metadata/wp7_parser.js | 10 +++-- src/metadata/wp8_parser.js | 10 +++-- src/plugin.js | 16 ++++---- 8 files changed, 100 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/745b0d80/package.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/745b0d80/spec/plugin.spec.js ---------------------------------------------------------------------- diff --cc spec/plugin.spec.js index bdebf53,f20fd5d..a1f64e3 --- a/spec/plugin.spec.js +++ b/spec/plugin.spec.js @@@ -127,13 -135,13 +135,19 @@@ describe('plugin command', function() }); }); }); + it('should trigger callback without an error', function(done) { + cordova.plugin('add', sample_plugins, function(e) { + expect(e).not.toBeDefined(); + done(); + }); + }); }); + describe('`search`', function() { + it('should call plugman.search', function() { + cordova.plugin('search', sample_plugins); + expect(plugman_search).toHaveBeenCalledWith(sample_plugins, jasmine.any(Function)); + }); + }); describe('`remove`',function() { var plugin_parser; var subset = ['android', 'wp7']; http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/745b0d80/src/plugin.js ----------------------------------------------------------------------
