github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into StudioProjectCompat. Dealing with latest

Browse Source 
commits merged into master.
This commit is contained in:
Joe Bowser
2017-07-31 13:43:21 -07:00
parent 5fe95570d2 2b53c98cf5
commit 46905ebe99
13 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec/e2e/helpers/projectActions.js
+2 -3
View File
@@ -45,7 +45,7 @@ module.exports.createProject = function (projectname, projectid, platformpath, c
module.exports.removeProject(projectid);
// create the project
var command = util.format('%s %s %s "%s"', createScriptPath, projectDirName, projectid, projectname);
var command = util.format('"%s" %s %s "%s"', createScriptPath, projectDirName, projectid, projectname);
cp.exec(command, function (error, stdout, stderr) {
if (error) {
console.log(stdout);
@@ -69,8 +69,7 @@ module.exports.updateProject = function (projectid, platformpath, callback) {
}
var projectDirName = getDirName(projectid);
var updateScriptPath = platformpath ? path.join(platformpath, 'bin/update') : path.join(cordova_bin, 'update');
var command = util.format('%s %s', updateScriptPath, projectDirName);
var command = util.format('"%s" %s', updateScriptPath, projectDirName);
cp.exec(command, function (error, stdout, stderr) {
if (error) {
console.log(stdout);
spec/unit/create.spec.js
+1 -1
View File
@@ -149,7 +149,7 @@ describe('create', function () {
spyOn(shell, 'cp');
spyOn(shell, 'mkdir');
spyOn(shell, 'sed');
config_mock = jasmine.createSpyObj('ConfigParser mock instance', ['packageName', 'name', 'android_activityName']);
config_mock = jasmine.createSpyObj('ConfigParser mock instance', ['packageName', 'android_packageName', 'name', 'android_activityName']);
events_mock = jasmine.createSpyObj('EventEmitter mock instance', ['emit']);
spyOn(check_reqs, 'get_target').and.returnValue(fake_android_target);
});