mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Backup E2E test: Normalize paths because glob returns / on WIN

Browse source
This commit is contained in:
Scott Nonnenberg 2018-04-20 17:29:55 -07:00
parent bd17c298a2
commit 6ec6bf08c8
No known key found for this signature in database
GPG key ID: 5F82280C35134661
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/backup_test.js
View file

@ -266,11 +266,13 @@ describe('Backup', () => {
return _.omit(model, ['id']); return _.omit(model, ['id']);
} }
const slash = path.sep === '/' ? '\\/' : '\\\\'; // On windows, attachmentsPath has a normal windows path format (\ separators), but
const twoSlashes = new RegExp(`.*${slash}.*${slash}.*`); // glob returns only /. We normalize to / separators for our manipulations.
const twoSlashes = /[^/]*\/[^/]*\/[^/]*/;
const normalizedBase = attachmentsPath.replace(/\\/g, '/');
function removeDirs(dirs) { function removeDirs(dirs) {
return _.filter(dirs, (fullDir) => { return _.filter(dirs, (fullDir) => {
const dir = fullDir.replace(attachmentsPath, ''); const dir = fullDir.replace(normalizedBase, '');
return twoSlashes.test(dir); return twoSlashes.test(dir);
}); });
} }