Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the failed file delete issue with default extensions tests. #774

Merged
merged 2 commits into from
Feb 27, 2017
Merged

Fix the failed file delete issue with default extensions tests. #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb8cb3
Fix the failed file delete issue with default extensions tests.
JimiC Feb 27, 2017
2d9c307
Make directory creation a synchronous process.
JimiC Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions test/manifestMerger/defaultExensions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ describe('DefaultExtensions: merging configuration documents', function () {
// ensure the tests write to the temp folder
process.chdir(tempFolderPath);

if (fs.existsSync(extensionSettings.customIconFolderName)) {
return;
if (!fs.existsSync(extensionSettings.customIconFolderName)) {
fs.mkdirSync(extensionSettings.customIconFolderName);
}

fs.mkdir(extensionSettings.customIconFolderName);
});

after(() => {
Expand Down Expand Up @@ -55,9 +53,10 @@ describe('DefaultExtensions: merging configuration documents', function () {
const iconName =
`${extensionSettings.defaultExtensionPrefix}${custom.default.file_light.icon}` +
`${extensionSettings.iconSuffix}.${custom.default.file_light.format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(iconNamePath, '');

const json = mergeConfig(custom, fileExtensions, null, folderExtensions, iconGenerator);
const def = json.iconDefinitions._file_light;
Expand All @@ -66,7 +65,9 @@ describe('DefaultExtensions: merging configuration documents', function () {
expect(def.iconPath).contain(iconName);
expect(def.iconPath).contain(extensionSettings.customIconFolderName);
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
}
});

Expand All @@ -80,9 +81,10 @@ describe('DefaultExtensions: merging configuration documents', function () {
const iconName =
`${extensionSettings.defaultExtensionPrefix}${custom.default.file.icon}` +
`${extensionSettings.iconSuffix}.${custom.default.file.format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(iconNamePath, '');

const json = mergeConfig(custom, fileExtensions, null, folderExtensions, iconGenerator);
const def = json.iconDefinitions._file;
Expand All @@ -91,7 +93,9 @@ describe('DefaultExtensions: merging configuration documents', function () {
expect(def.iconPath).contain(iconName);
expect(def.iconPath).contain(extensionSettings.customIconFolderName);
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
}
});

Expand Down Expand Up @@ -125,10 +129,12 @@ describe('DefaultExtensions: merging configuration documents', function () {
const iconNameOpen =
`${extensionSettings.defaultExtensionPrefix}${custom.default.folder_light.icon}_opened` +
`${extensionSettings.iconSuffix}.${custom.default.folder_light.format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);
const iconNameOpenPath = path.join(extensionSettings.customIconFolderName, iconNameOpen);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconNameOpen), '');
fs.writeFileSync(iconNamePath, '');
fs.writeFileSync(iconNameOpenPath, '');

const json = mergeConfig(null, fileExtensions, custom, folderExtensions, iconGenerator);
const def = json.iconDefinitions._folder_light;
Expand All @@ -142,8 +148,12 @@ describe('DefaultExtensions: merging configuration documents', function () {
expect(def.iconPath).contain(extensionSettings.customIconFolderName);
expect(defOpen.iconPath).contain(extensionSettings.customIconFolderName);
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconNameOpen));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNameOpenPath);
}
}
});

Expand All @@ -160,10 +170,12 @@ describe('DefaultExtensions: merging configuration documents', function () {
const iconNameOpen =
`${extensionSettings.defaultExtensionPrefix}${custom.default.folder.icon}_opened` +
`${extensionSettings.iconSuffix}.${custom.default.folder.format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);
const iconNameOpenPath = path.join(extensionSettings.customIconFolderName, iconNameOpen);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconNameOpen), '');
fs.writeFileSync(iconNamePath, '');
fs.writeFileSync(iconNameOpenPath, '');

const json = mergeConfig(null, fileExtensions, custom, folderExtensions, iconGenerator);
const def = json.iconDefinitions._folder;
Expand All @@ -177,8 +189,12 @@ describe('DefaultExtensions: merging configuration documents', function () {
expect(def.iconPath).contain(extensionSettings.customIconFolderName);
expect(defOpen.iconPath).contain(extensionSettings.customIconFolderName);
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconNameOpen));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNameOpenPath);
}
}
});

Expand Down
13 changes: 7 additions & 6 deletions test/manifestMerger/fileExtensions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ describe('FileExtensions: merging configuration documents', function () {
// ensure the tests write to the temp folder
process.chdir(tempFolderPath);

if (fs.existsSync(extensionSettings.customIconFolderName)) {
return;
if (!fs.existsSync(extensionSettings.customIconFolderName)) {
fs.mkdirSync(extensionSettings.customIconFolderName);
}

fs.mkdir(extensionSettings.customIconFolderName);
});

after(() => {
Expand Down Expand Up @@ -170,17 +168,20 @@ describe('FileExtensions: merging configuration documents', function () {
const iconName =
`${extensionSettings.filePrefix}${custom.supported[0].icon}` +
`${extensionSettings.iconSuffix}.${custom.supported[0].format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(iconNamePath, '');

const json = mergeConfig(custom, fileExtensions, null, folderExtensions, iconGenerator);
const icon = json.iconDefinitions['_f_custom_icon'];
expect(icon).exist;
expect(icon.iconPath).contains(extensionSettings.customIconFolderName);
expect(json.fileExtensions['custom']).equals('_f_custom_icon');
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
}
});

Expand Down
22 changes: 13 additions & 9 deletions test/manifestMerger/folderExtensions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ describe('FolderExtensions: merging configuration documents', function () {
// ensure the tests write to the temp folder
process.chdir(tempFolderPath);

if (fs.existsSync(extensionSettings.customIconFolderName)) {
return;
if (!fs.existsSync(extensionSettings.customIconFolderName)) {
fs.mkdirSync(extensionSettings.customIconFolderName);
}

fs.mkdir(extensionSettings.customIconFolderName);
});

after(() => {
Expand Down Expand Up @@ -135,7 +133,7 @@ describe('FolderExtensions: merging configuration documents', function () {
const json = mergeConfig(null, fileExtensions, custom, folderExtensions, iconGenerator);
const icon = json.iconDefinitions['_fd_custom_icon'];
expect(icon).exist;
expect(icon.iconPath.substr(icon.iconPath.length - 3, 3)).equals('svg');
expect(path.extname(icon.iconPath)).equals('.svg');
});

it('has a custom path', function () {
Expand All @@ -155,10 +153,12 @@ describe('FolderExtensions: merging configuration documents', function () {
const iconNameOpen =
`${extensionSettings.folderPrefix}${custom.supported[0].icon}_opened` +
`${extensionSettings.iconSuffix}.${custom.supported[0].format}`;
const iconNamePath = path.join(extensionSettings.customIconFolderName, iconName);
const iconNameOpenPath = path.join(extensionSettings.customIconFolderName, iconNameOpen);

try {
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconName), '');
fs.writeFileSync(path.join(extensionSettings.customIconFolderName, iconNameOpen), '');
fs.writeFileSync(iconNamePath, '');
fs.writeFileSync(iconNameOpenPath, '');

const json = mergeConfig(null, fileExtensions, custom, folderExtensions, iconGenerator);
const icon = json.iconDefinitions['_fd_custom_icon'];
Expand All @@ -167,8 +167,12 @@ describe('FolderExtensions: merging configuration documents', function () {
expect(json.folderNames['custom']).equals('_fd_custom_icon');
expect(json.folderNamesExpanded['custom']).equals('_fd_custom_icon_open');
} finally {
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconName));
fs.unlinkSync(path.join(extensionSettings.customIconFolderName, iconNameOpen));
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNamePath);
}
if (fs.existsSync(iconNamePath)) {
fs.unlinkSync(iconNameOpenPath);
}
}
});

Expand Down