CB-13055 : updated after PR feedback

This closes #608
apache · Dec 12, 2017 · 6e22fb4 · 6e22fb4
1 parent 62f7c64
commit 6e22fb4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 136 deletions.
diff --git a/integration-tests/platform.spec.js b/integration-tests/platform.spec.js
@@ -128,8 +128,8 @@ describe('platform end-to-end', function () {
                 expect(err).toBeUndefined();
             }).fin(done);
     });
-    // was using old fetch code/gitclone... test might not be valid anymore.
-    xit('Test 002 : should install plugins correctly while adding platform', function (done) {
+
+    it('Test 002 : should install plugins correctly while adding platform', function (done) {
         cordova.plugin('add', path.join(pluginsDir, 'test'), {'fetch': true})
             .then(function () {
                 return cordova.platform('add', [helpers.testPlatform], {'fetch': true});

diff --git a/integration-tests/plugin.spec.js b/integration-tests/plugin.spec.js
@@ -241,7 +241,7 @@ describe('plugin end-to-end', function () {
             .fin(done);
     }, 30000);
 
-    it('Test 010 : should use registry.info to get plugin & version', function (done) {
+    it('Test 010 : should select the plugin version based on npm info when fetching from npm', function (done) {
         mockPluginFetch(npmInfoTestPlugin, path.join(pluginsDir, npmInfoTestPlugin));
 
         spyOn(plugin_util, 'info').and.callThrough();

diff --git a/integration-tests/plugman_fetch.spec.js b/integration-tests/plugman_fetch.spec.js
@@ -151,7 +151,7 @@ describe('fetch', function () {
         });
     });
 
-    xdescribe('fetch recursive error CB-8809', function () {
+    describe('fetch recursive error CB-8809', function () {
 
         var srcDir = path.join(plugins_dir, 'recursivePlug');
         var appDir = path.join(plugins_dir, 'recursivePlug', 'demo');

diff --git a/src/plugman/fetch.js b/src/plugman/fetch.js
@@ -83,7 +83,6 @@ function fetchPlugin (plugin_src, plugins_dir, options) {
         }
     }
     return Q.when().then(function () {
-        // If it's not a network URL, it's either a local path or a plugin ID.
         var plugin_dir = cordovaUtil.fixRelativePath(path.join(plugin_src, options.subdir));
         return Q.when().then(function () {
             // check if it is a local path
@@ -114,7 +113,7 @@ function fetchPlugin (plugin_src, plugins_dir, options) {
                         });
                 }
             }
-            // If there is no such local path, it's a plugin id or id@versionspec.
+            // If there is no such local path or it's a git URL, it's a plugin id or id@versionspec.
             // First look for it in the local search path (if provided).
             var pinfo = findLocalPlugin(plugin_src, options.searchpath, pluginInfoProvider);
             if (pinfo) {

diff --git a/src/util/npm-helper.js b/src/util/npm-helper.js