Merge branch 'fixtests'

This commit is contained in:
Ian Clelland 2014-11-27 14:24:58 -05:00
commit 6c253e832d

View File

@ -253,7 +253,10 @@ exports.defineAutoTests = function () {
var lastProgressEvent = null;
if (!/^file/.exec(remoteFile) && cordova.platformId !== 'blackberry10') {
if (cordova.platformId !== 'windowsphone')
expect(remoteFile).toMatch(/^file:/);
else
expect(remoteFile).toMatch(/^x-wmapp0:/);
done();
return;
}
@ -684,6 +687,9 @@ exports.defineAutoTests = function () {
ft.upload("/usr/local/bad/file/path.txt", remoteFile, uploadWin, uploadFail);
});
it("filetransfer.spec.27 should be able to set custom headers", function (done) {
if (cordova.platformId === 'windowsphone') {
pending();
}
var uploadFail = createFail(done, "Upload error callback should not have been called");
var fileFail = createFail(done, "Error writing file to be uploaded");
var remoteFile = "http://whatheaders.com";