Skip to content

:CB-13532 : updated to include a check for pkgJson devDependencies #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevengill merged 1 commit into from
Dec 11, 2017
Merged

:CB-13532 : updated to include a check for pkgJson devDependencies #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion spec/cordova/platform/addHelper.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('cordova/platform/addHelper', function () {
'platform': 'atari'
};
var package_json_mock;
package_json_mock = jasmine.createSpyObj('package json mock', ['cordova', 'dependencies']);
package_json_mock = jasmine.createSpyObj('package json mock', ['cordova', 'dependencies', 'devDependencies']);
package_json_mock.dependencies = {};
package_json_mock.cordova = {};

Expand Down Expand Up @@ -301,6 +301,23 @@ describe('cordova/platform/addHelper', function () {
}).done(done);
});

it('should use pkgJson version devDependencies, if dependencies are undefined', function (done) {
package_json_mock.dependencies = undefined;
package_json_mock.cordova = {'platforms': ['ios']};
package_json_mock.devDependencies['ios'] = {};
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, ['ios'], {save: true, restoring: true}).then(function () {
expect(platform_addHelper.getVersionFromConfigFile).not.toHaveBeenCalled();
expect(fs.writeFileSync).toHaveBeenCalled();
}).fail(function (e) {
fail('fail handler unexpectedly invoked');
console.error(e);
}).done(done);
});

it('should only write the package.json file if it was modified', function (done) {
package_json_mock.cordova = {'platforms': ['ios']};
cordova_util.requireNoCache.and.returnValue(package_json_mock);
Expand Down
6 changes: 6 additions & 0 deletions src/cordova/platform/addHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ function addHelper (cmd, hooksRunner, projectRoot, targets, opts) {
} else if (pkgJson.dependencies[platform]) {
spec = pkgJson.dependencies[platform];
}
} else if (spec === undefined && pkgJson && pkgJson.devDependencies && cmd === 'add') {
if (pkgJson.devDependencies['cordova-' + platform]) {
spec = pkgJson.devDependencies['cordova-' + platform];
} else if (pkgJson.devDependencies[platform]) {
spec = pkgJson.devDependencies[platform];
}
}

if (platform && spec === undefined && cmd === 'add') {
Expand Down