chore: remove windows leftovers (#368)

This commit is contained in:
jcesarmobile
2023-09-02 09:02:07 +02:00
committed by GitHub
parent 934ed5d67e
commit 7715cc9511
2 changed files with 8 additions and 50 deletions

View File

@@ -19,7 +19,7 @@
* *
*/ */
/* global cordova, FileTransfer, FileTransferError, FileUploadOptions, WinJS, LocalFileSystem */ /* global cordova, FileTransfer, FileTransferError, FileUploadOptions, LocalFileSystem */
exports.defineAutoTests = function () { exports.defineAutoTests = function () {
'use strict'; 'use strict';
@@ -30,7 +30,6 @@ exports.defineAutoTests = function () {
const DEFAULT_FILESYSTEM_SIZE = 1024 * 50; // filesystem size in bytes const DEFAULT_FILESYSTEM_SIZE = 1024 * 50; // filesystem size in bytes
const UNKNOWN_HOST = 'http://foobar.apache.org'; const UNKNOWN_HOST = 'http://foobar.apache.org';
const DOWNLOAD_TIMEOUT = 15 * ONE_SECOND; const DOWNLOAD_TIMEOUT = 15 * ONE_SECOND;
const LONG_TIMEOUT = 60 * ONE_SECOND;
const UPLOAD_TIMEOUT = 15 * ONE_SECOND; const UPLOAD_TIMEOUT = 15 * ONE_SECOND;
const ABORT_DELAY = 100; // for abort() tests const ABORT_DELAY = 100; // for abort() tests
const LATIN1_SYMBOLS = '¥§©ÆÖÑøøø¼'; const LATIN1_SYMBOLS = '¥§©ÆÖÑøøø¼';
@@ -51,9 +50,7 @@ exports.defineAutoTests = function () {
let SERVER_WITH_CREDENTIALS = ''; let SERVER_WITH_CREDENTIALS = '';
// flags // flags
const isWindows = cordova.platformId === 'windows';
const isBrowser = cordova.platformId === 'browser'; const isBrowser = cordova.platformId === 'browser';
const isWindowsPhone = isWindows && WinJS.Utilities.isPhone;
const isIE = isBrowser && navigator.userAgent.indexOf('Trident') >= 0; const isIE = isBrowser && navigator.userAgent.indexOf('Trident') >= 0;
const isIos = cordova.platformId === 'ios'; const isIos = cordova.platformId === 'ios';
const isIot = cordova.platformId === 'android' && navigator.userAgent.indexOf('iot') >= 0; const isIot = cordova.platformId === 'android' && navigator.userAgent.indexOf('iot') >= 0;
@@ -488,12 +485,6 @@ exports.defineAutoTests = function () {
it( it(
'filetransfer.spec.7 should download a file using file:// (when hosted from file://)', 'filetransfer.spec.7 should download a file using file:// (when hosted from file://)',
function (done) { function (done) {
// for Windows platform it's ms-appdata:/// by default, not file://
if (isWindows) {
pending();
return;
}
const fileURL = window.location.protocol + '//' + window.location.pathname.replace(/ /g, '%20'); const fileURL = window.location.protocol + '//' + window.location.pathname.replace(/ /g, '%20');
const specContext = this; const specContext = this;
@@ -557,7 +548,7 @@ exports.defineAutoTests = function () {
specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail); specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail);
}, },
isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT DOWNLOAD_TIMEOUT
); );
it( it(
@@ -625,7 +616,7 @@ exports.defineAutoTests = function () {
specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail); specContext.transfer.download(fileURL, specContext.localFilePath, downloadWin, downloadFail);
}, },
isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT DOWNLOAD_TIMEOUT
); );
it( it(
@@ -752,7 +743,7 @@ exports.defineAutoTests = function () {
this.transfer.download(fileURL, this.localFilePath, downloadWin, downloadFail); this.transfer.download(fileURL, this.localFilePath, downloadWin, downloadFail);
}, },
isWindows ? LONG_TIMEOUT : DOWNLOAD_TIMEOUT DOWNLOAD_TIMEOUT
); );
it('filetransfer.spec.16 should handle bad file path', function (done) { it('filetransfer.spec.16 should handle bad file path', function (done) {
@@ -806,11 +797,7 @@ exports.defineAutoTests = function () {
expect(nativeURL).toBeTruthy(); expect(nativeURL).toBeTruthy();
expect(nativeURL).toEqual(jasmine.any(String)); expect(nativeURL).toEqual(jasmine.any(String));
if (isWindows) { expect(nativeURL.substring(0, 7)).toBe('file://');
expect(nativeURL.substring(0, 14)).toBe('ms-appdata:///');
} else {
expect(nativeURL.substring(0, 7)).toBe('file://');
}
done(); done();
}; };
@@ -1156,9 +1143,9 @@ exports.defineAutoTests = function () {
}, GRACE_TIME_DELTA); }, GRACE_TIME_DELTA);
}; };
// windows store and ios are too fast, win is called before we have a chance to abort // ios is too fast, win is called before we have a chance to abort
// so let's get them busy - while not providing an extra load to the slow Android emulators // so let's get them busy - while not providing an extra load to the slow Android emulators
const arrayLength = (isWindows && !isWindowsPhone) || isIos ? 3000000 : isIot ? 150000 : 200000; const arrayLength = isIos ? 3000000 : isIot ? 150000 : 200000;
writeFile(specContext.root, specContext.fileName, new Array(arrayLength).join('aborttest!'), fileWin, done); writeFile(specContext.root, specContext.fileName, new Array(arrayLength).join('aborttest!'), fileWin, done);
}, },
UPLOAD_TIMEOUT UPLOAD_TIMEOUT
@@ -1746,9 +1733,6 @@ exports.defineAutoTests = function () {
it( it(
'filetransfer.spec.43 chunkedMode=true, multipart=false', 'filetransfer.spec.43 chunkedMode=true, multipart=false',
function (done) { function (done) {
if (isWindows) {
pending();
}
testChunkedModeBase.call(this, true, false, done); testChunkedModeBase.call(this, true, false, done);
}, },
UPLOAD_TIMEOUT * 11 UPLOAD_TIMEOUT * 11
@@ -1765,9 +1749,6 @@ exports.defineAutoTests = function () {
it( it(
'filetransfer.spec.45 chunkedMode=true, multipart=true', 'filetransfer.spec.45 chunkedMode=true, multipart=true',
function (done) { function (done) {
if (isWindows) {
pending();
}
testChunkedModeBase.call(this, true, true, done); testChunkedModeBase.call(this, true, true, done);
}, },
UPLOAD_TIMEOUT * 11 UPLOAD_TIMEOUT * 11

View File

@@ -19,7 +19,7 @@
* *
*/ */
/* global cordova, FileSystem */ /* global FileSystem */
const argscheck = require('cordova/argscheck'); const argscheck = require('cordova/argscheck');
const exec = require('cordova/exec'); const exec = require('cordova/exec');
@@ -64,20 +64,6 @@ function getBasicAuthHeader (urlString) {
return header; return header;
} }
function convertHeadersToArray (headers) {
const result = [];
for (const header in headers) {
if (Object.prototype.hasOwnProperty.call(headers, header)) {
const headerValue = headers[header];
result.push({
name: header,
value: headerValue.toString()
});
}
}
return result;
}
let idCounter = 0; let idCounter = 0;
/** /**
@@ -139,11 +125,6 @@ FileTransfer.prototype.upload = function (filePath, server, successCallback, err
} }
} }
if (cordova.platformId === 'windowsphone') {
headers = headers && convertHeadersToArray(headers);
params = params && convertHeadersToArray(params);
}
const fail = const fail =
errorCallback && errorCallback &&
function (e) { function (e) {
@@ -205,10 +186,6 @@ FileTransfer.prototype.download = function (source, target, successCallback, err
headers = options.headers || null; headers = options.headers || null;
} }
if (cordova.platformId === 'windowsphone' && headers) {
headers = convertHeadersToArray(headers);
}
const win = function (result) { const win = function (result) {
if (typeof result.lengthComputable !== 'undefined') { if (typeof result.lengthComputable !== 'undefined') {
if (self.onprogress) { if (self.onprogress) {