Skip to content

Commit 3dde5a9

Browse files
breautekbreautek
committed
refactor(tests): To use nativeURL instead of .toURL() where it makes sense
1 parent 411a8bf commit 3dde5a9

File tree

1 file changed

+32
-18
lines changed

1 file changed

+32
-18
lines changed

‎tests/tests.js

+32-18
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ exports.defineAutoTests = function () {
135135
success = success || function () {};
136136
error = error || failed.bind(null, success, 'deleteEntry failed.');
137137

138-
window.resolveLocalFileSystemURL(root.toURL() + '/' + name, function (entry) {
138+
window.resolveLocalFileSystemURL(root.nativeURL + '/' + name, function (entry) {
139139
if (entry.isDirectory === true) {
140140
entry.removeRecursively(success, error);
141141
} else {
@@ -321,7 +321,7 @@ exports.defineAutoTests = function () {
321321
deleteEntry(fileName, done);
322322
};
323323
createFile(fileName, function (entry) {
324-
window.resolveLocalFileSystemURL(entry.toURL(), win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URL: ' + entry.toURL()));
324+
window.resolveLocalFileSystemURL(entry.nativeURL, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URL: ' + entry.nativeURL));
325325
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName), failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
326326
});
327327

@@ -338,7 +338,7 @@ exports.defineAutoTests = function () {
338338
deleteEntry(fileName, done);
339339
};
340340
createFile(fileName, function (entry) {
341-
const entryURL = entry.toURL() + '/';
341+
const entryURL = entry.nativeURL + '/';
342342
window.resolveLocalFileSystemURL(entryURL, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URL: ' + entryURL));
343343
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName), failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
344344
});
@@ -357,7 +357,7 @@ exports.defineAutoTests = function () {
357357
};
358358
function gotDirectory (entry) {
359359
// lookup file system entry
360-
window.resolveLocalFileSystemURL(entry.toURL(), win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving directory URL: ' + entry.toURL()));
360+
window.resolveLocalFileSystemURL(entry.nativeURL, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving directory URL: ' + entry.nativeURL));
361361
}
362362
createDirectory(fileName, gotDirectory, failed.bind(null, done, 'createDirectory - Error creating directory: ' + fileName), failed.bind(null, done, 'createDirectory - Error creating directory: ' + fileName));
363363
});
@@ -376,7 +376,7 @@ exports.defineAutoTests = function () {
376376
};
377377
function gotDirectory (entry) {
378378
// lookup file system entry
379-
let entryURL = entry.toURL();
379+
let entryURL = entry.nativeURL;
380380
entryURL = entryURL.substring(0, entryURL.length - 1);
381381
window.resolveLocalFileSystemURL(entryURL, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving directory URL: ' + entryURL));
382382
}
@@ -412,12 +412,12 @@ exports.defineAutoTests = function () {
412412
};
413413
// create a new file entry
414414
createFile(fileName, function (entry) {
415-
window.resolveLocalFileSystemURL(entry.toURL() + '?1234567890', win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URI: ' + entry.toURL()));
415+
window.resolveLocalFileSystemURL(entry.nativeURL + '?1234567890', win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URI: ' + entry.nativeURL));
416416
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
417417
});
418418

419419
it('file.spec.11 should error (NOT_FOUND_ERR) when resolving (non-existent) invalid file name', function (done) {
420-
const fileName = joinURL(root.toURL(), 'this.is.not.a.valid.file.txt');
420+
const fileName = joinURL(root.nativeURL, 'this.is.not.a.valid.file.txt');
421421
const fail = function (error) {
422422
expect(error).toBeDefined();
423423
if (isChrome) {
@@ -488,7 +488,7 @@ exports.defineAutoTests = function () {
488488
expect(entry.removeRecursively).toBeDefined();
489489
done();
490490
};
491-
window.resolveLocalFileSystemURL(root.toURL(), win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URI: ' + root.toURL()));
491+
window.resolveLocalFileSystemURL(root.nativeURL, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving file URI: ' + root.nativeURL));
492492
});
493493
});
494494

@@ -684,7 +684,7 @@ exports.defineAutoTests = function () {
684684
function getDir (dirEntry) {
685685
expect(dirEntry.filesystem).toBeDefined();
686686
expect(dirEntry.filesystem).toBe(root.filesystem);
687-
const dirURI = dirEntry.toURL();
687+
const dirURI = dirEntry.nativeURL;
688688
// now encode URI and try to resolve
689689
window.resolveLocalFileSystemURL(dirURI, win, failed.bind(null, done, 'window.resolveLocalFileSystemURL - getDir function - Error resolving directory: ' + dirURI));
690690
}
@@ -3355,7 +3355,7 @@ exports.defineAutoTests = function () {
33553355
/* These specs verify that paths with parent references i("..") in them
33563356
* work correctly, and do not cause the application to crash.
33573357
*/
3358-
it('file.spec.110 should not throw exception resolving parent refefences', function (done) {
3358+
it('file.spec.110 should not throw exception resolving parent references', function (done) {
33593359
/* This is a direct copy of file.spec.9, with the filename changed, * as reported in CB-5721.
33603360
*/
33613361
const fileName = 'resolve.file.uri';
@@ -3364,12 +3364,12 @@ exports.defineAutoTests = function () {
33643364
createDirectory(dirName, function () {
33653365
createFile(dirName + '/../' + fileName, function (entry) {
33663366
// lookup file system entry
3367-
window.resolveLocalFileSystemURL(entry.toURL(), function (fileEntry) {
3367+
window.resolveLocalFileSystemURL(entry.nativeURL, function (fileEntry) {
33683368
expect(fileEntry).toBeDefined();
33693369
expect(fileEntry.name).toCanonicallyMatch(fileName);
33703370
// cleanup
33713371
deleteEntry(fileName, done);
3372-
}, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving URI: ' + entry.toURL()));
3372+
}, failed.bind(null, done, 'window.resolveLocalFileSystemURL - Error resolving URI: ' + entry.nativeURL));
33733373
}, failed.bind(null, done, 'createFile - Error creating file: ../' + fileName));
33743374
}, failed.bind(null, done, 'createDirectory - Error creating directory: ' + dirName));
33753375
});
@@ -3442,6 +3442,8 @@ exports.defineAutoTests = function () {
34423442
// From Cordova-Android 10.x, app content is served from the "https" scheme by default
34433443
// The paramedic plugin changes the scheme to http to avoid ssl.
34443444
pathExpect = 'http://';
3445+
} else if (cordova.platformId === 'ios') {
3446+
pathExpect = 'app://';
34453447
} else if (isChrome) {
34463448
pathExpect = 'filesystem:http://';
34473449
}
@@ -3502,7 +3504,7 @@ exports.defineAutoTests = function () {
35023504
const fileName = 'native.resolve.uri';
35033505
// create a new file entry
35043506
createFile(fileName, function (entry) {
3505-
resolveLocalFileSystemURL(entry.toURL(), function (entry) { // eslint-disable-line no-undef
3507+
resolveLocalFileSystemURL(entry.nativeURL, function (entry) { // eslint-disable-line no-undef
35063508
expect(entry.toNativeURL).toBeDefined();
35073509
expect(entry.name).toCanonicallyMatch(fileName);
35083510
expect(typeof entry.toNativeURL).toBe('function');
@@ -3512,7 +3514,7 @@ exports.defineAutoTests = function () {
35123514
expect(nativeURL.substring(nativeURL.length - fileName.length)).toEqual(fileName);
35133515
// cleanup
35143516
deleteEntry(fileName, done);
3515-
}, failed.bind(null, done, 'resolveLocalFileSystemURL - Error resolving file URL: ' + entry.toURL()));
3517+
}, failed.bind(null, done, 'resolveLocalFileSystemURL - Error resolving file URL: ' + entry.nativeURL));
35163518
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
35173519
});
35183520
});
@@ -3553,7 +3555,10 @@ exports.defineAutoTests = function () {
35533555
});
35543556
});
35553557

3556-
it('file.spec.121 should resolve native URLs returned by API', function (done) {
3558+
// TODO: .toNativeURL() / .toURL() were repurposed at some point so return a DOM-usable url
3559+
// these urls are not resolvable as they expect file:// or content://schemes
3560+
// I think these tests can simply be removed.
3561+
xit('file.spec.121 should resolve native URLs returned by API', function (done) {
35573562
const fileName = 'native.resolve.uri1';
35583563
// create a new file entry
35593564
createFile(fileName, function (entry) {
@@ -3566,7 +3571,10 @@ exports.defineAutoTests = function () {
35663571
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
35673572
});
35683573

3569-
it('file.spec.122 should resolve native URLs returned by API with localhost', function (done) {
3574+
// TODO: .toNativeURL() / .toURL() were repurposed at some point so return a DOM-usable url
3575+
// these urls are not resolvable as they expect file:// or content://schemes
3576+
// I think these tests can simply be removed.
3577+
xit('file.spec.122 should resolve native URLs returned by API with localhost', function (done) {
35703578
const fileName = 'native.resolve.uri2';
35713579
// create a new file entry
35723580
createFile(fileName, function (entry) {
@@ -3580,7 +3588,10 @@ exports.defineAutoTests = function () {
35803588
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
35813589
});
35823590

3583-
it('file.spec.123 should resolve native URLs returned by API with query string', function (done) {
3591+
// TODO: .toNativeURL() / .toURL() were repurposed at some point so return a DOM-usable url
3592+
// these urls are not resolvable as they expect file:// or content://schemes
3593+
// I think these tests can simply be removed.
3594+
xit('file.spec.123 should resolve native URLs returned by API with query string', function (done) {
35843595
const fileName = 'native.resolve.uri3';
35853596
// create a new file entry
35863597
createFile(fileName, function (entry) {
@@ -3594,7 +3605,10 @@ exports.defineAutoTests = function () {
35943605
}, failed.bind(null, done, 'createFile - Error creating file: ' + fileName));
35953606
});
35963607

3597-
it('file.spec.124 should resolve native URLs returned by API with localhost and query string', function (done) {
3608+
// TODO: .toNativeURL() / .toURL() were repurposed at some point so return a DOM-usable url
3609+
// these urls are not resolvable as they expect file:// or content://schemes
3610+
// I think these tests can simply be removed.
3611+
xit('file.spec.124 should resolve native URLs returned by API with localhost and query string', function (done) {
35983612
const fileName = 'native.resolve.uri4';
35993613
// create a new file entry
36003614
createFile(fileName, function (entry) {

0 commit comments

Comments
 (0)