mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-01 02:12:58 +08:00
It passed then failed. I'll change the test for now, because perfect is the enemy of good.
This commit is contained in:
parent
b65af106ff
commit
00c879e27d
@ -145,9 +145,6 @@ function writeProjectProperties (projectPath, target_api) {
|
|||||||
|
|
||||||
// This makes no sense, what if you're building with a different build system?
|
// This makes no sense, what if you're building with a different build system?
|
||||||
function prepBuildFiles (projectPath, builder) {
|
function prepBuildFiles (projectPath, builder) {
|
||||||
if (builder === null) {
|
|
||||||
builder = 'studio';
|
|
||||||
}
|
|
||||||
var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders'));
|
var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders'));
|
||||||
buildModule.getBuilder(builder).prepBuildFiles();
|
buildModule.getBuilder(builder).prepBuildFiles();
|
||||||
}
|
}
|
||||||
@ -335,7 +332,7 @@ exports.create = function (project_path, config, options, events) {
|
|||||||
});
|
});
|
||||||
// Link it to local android install.
|
// Link it to local android install.
|
||||||
exports.writeProjectProperties(project_path, target_api);
|
exports.writeProjectProperties(project_path, target_api);
|
||||||
exports.prepBuildFiles(project_path);
|
exports.prepBuildFiles(project_path, 'studio');
|
||||||
events.emit('log', generateDoneMessage('create', options.link));
|
events.emit('log', generateDoneMessage('create', options.link));
|
||||||
}).thenResolve(project_path);
|
}).thenResolve(project_path);
|
||||||
};
|
};
|
||||||
|
@ -274,7 +274,7 @@ describe('create', function () {
|
|||||||
});
|
});
|
||||||
it('should prepare build files', function (done) {
|
it('should prepare build files', function (done) {
|
||||||
create.create(project_path, config_mock, {}, events_mock).then(function () {
|
create.create(project_path, config_mock, {}, events_mock).then(function () {
|
||||||
expect(create.prepBuildFiles).toHaveBeenCalledWith(project_path);
|
expect(create.prepBuildFiles).toHaveBeenCalledWith(project_path, 'studio');
|
||||||
}).fail(fail).done(done);
|
}).fail(fail).done(done);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user