You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/08/22 17:30:48 UTC
cordova-lib git commit: CB-12944: Platform's spec is ignored in
config.xml if package.json doesn't contain dependency for platform
Repository: cordova-lib
Updated Branches:
refs/heads/master e4c216e20 -> da8ebf6cb
CB-12944: Platform's spec is ignored in config.xml if package.json doesn't contain dependency for platform
This closes #565
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/da8ebf6c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/da8ebf6c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/da8ebf6c
Branch: refs/heads/master
Commit: da8ebf6cb81dd84c22e24fdf0baff9837a544b2d
Parents: e4c216e
Author: Nikita Matrosov <v-...@microsoft.com>
Authored: Tue Aug 15 12:47:35 2017 +0300
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Aug 22 10:25:07 2017 -0700
----------------------------------------------------------------------
spec/cordova/platform/addHelper.spec.js | 15 +++++++++++++++
src/cordova/platform/addHelper.js | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da8ebf6c/spec/cordova/platform/addHelper.spec.js
----------------------------------------------------------------------
diff --git a/spec/cordova/platform/addHelper.spec.js b/spec/cordova/platform/addHelper.spec.js
index fc5ef40..72f0174 100644
--- a/spec/cordova/platform/addHelper.spec.js
+++ b/spec/cordova/platform/addHelper.spec.js
@@ -170,6 +170,21 @@ describe('cordova/platform/addHelper', function () {
}).done(done);
});
+ it('should use spec from config.xml if package.json does not contain dependency for platform', function (done) {
+ package_json_mock.dependencies = {};
+ cordova_util.requireNoCache.and.returnValue(package_json_mock);
+ fs.existsSync.and.callFake(function (filePath) {
+ return path.basename(filePath) === 'package.json';
+ });
+
+ platform_addHelper('add', hooks_mock, projectRoot, ['windows'], {restoring: true}).then(function () {
+ expect(platform_addHelper.getVersionFromConfigFile).toHaveBeenCalled();
+ }).fail(function (e) {
+ fail('fail handler unexpectedly invoked');
+ console.error(e);
+ }).done(done);
+ });
+
it('should attempt to retrieve from config.xml if exists and package.json does not', function (done) {
platform_addHelper('add', hooks_mock, projectRoot, ['atari'], {restoring: true}).then(function () {
expect(platform_addHelper.getVersionFromConfigFile).toHaveBeenCalled();
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da8ebf6c/src/cordova/platform/addHelper.js
----------------------------------------------------------------------
diff --git a/src/cordova/platform/addHelper.js b/src/cordova/platform/addHelper.js
index 702543c..1c0b39f 100644
--- a/src/cordova/platform/addHelper.js
+++ b/src/cordova/platform/addHelper.js
@@ -111,7 +111,9 @@ function addHelper (cmd, hooksRunner, projectRoot, targets, opts) {
} else if (pkgJson.dependencies[platform]) {
spec = pkgJson.dependencies[platform];
}
- } else if (platform && spec === undefined && cmd === 'add') {
+ }
+
+ if (platform && spec === undefined && cmd === 'add') {
events.emit('verbose', 'No version supplied. Retrieving version from config.xml...');
spec = module.exports.getVersionFromConfigFile(platform, cfg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org