Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-17 04:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests, work on fsPaths

Browse Source
This commit is contained in:
Daniel Imms
2016-11-28 18:13:31 -08:00
parent 3f721b7b28
commit e8eb78ee67
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/backup/node/backupFileService.ts
+1 -1
View File
@@ -67,7 +67,7 @@ export class BackupFilesModel implements IBackupFilesModel {
}
public getTextFiles(): string[] {
return Object.keys(this.cache).filter(k => path.basename(path.dirname(k)) === 'file');
return Object.keys(this.cache).filter(k => path.basename(path.dirname(k)) === 'file').map(k => k.replace('file://', ''));
}
public remove(resource: Uri): void {
src/vs/workbench/services/backup/test/backupFileService.test.ts
+21 -9
View File
@@ -108,7 +108,7 @@ suite('BackupFileService', () => {
service.backupResource(fooFile, 'test').then(() => {
assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
assert.equal(fs.existsSync(fooBackupPath), true);
assert.equal(fs.readFileSync(fooBackupPath), 'test');
assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.fsPath}\ntest`);
done();
});
});
@@ -170,10 +170,24 @@ suite('BackupFileService', () => {
});
});
test('getWorkspaceTextFileBackups', done => {
service.backupResource(fooFile, `${fooFile.fsPath}\ntest`).then(() => {
test('getWorkspaceTextFileBackups - text file', done => {
service.backupResource(fooFile, `test`).then(() => {
service.getWorkspaceTextFileBackups().then(textFiles => {
assert.deepEqual(textFiles, [fooFile.toString()]);
assert.deepEqual(textFiles, [fooFile.fsPath]);
service.backupResource(barFile, `test`).then(() => {
service.getWorkspaceTextFileBackups().then(textFiles => {
assert.deepEqual(textFiles, [fooFile.fsPath, barFile.fsPath]);
done();
});
});
});
});
});
test('getWorkspaceTextFileBackups - untitled file', done => {
service.backupResource(untitledFile, `test`).then(() => {
service.getWorkspaceTextFileBackups().then(textFiles => {
assert.deepEqual(textFiles, []);
done();
});
});
@@ -245,12 +259,10 @@ suite('BackupFileService', () => {
assert.deepEqual(model.getTextFiles(), []);
const resource1 = Uri.file('/root/file/foo.html');
const resource2 = Uri.file('/root/file/bar.html');
model.add(resource1);
model.add(resource2);
model.add(Uri.file('/root/file/foo.html'));
model.add(Uri.file('/root/file/bar.html'));
model.add(Uri.file('/root/untitled/bar.html'));
assert.deepEqual(model.getTextFiles(), [resource1.toString(), resource2.toString()]);
assert.deepEqual(model.getTextFiles(), ['/root/file/foo.html', '/root/file/bar.html']);
});
});