Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
bitdisaster committed Jun 10, 2020
1 parent 1ab3fd2 commit 56264de
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions __tests__/creator-spec.ts
Expand Up @@ -457,12 +457,12 @@ testIncludes('UninstallDisplayIcon component-ref', '<ComponentRef Id="UninstallD
testIncludesNot('RegistryRunKey component', '<Component Id="RegistryRunKey"');
testIncludesNot('RegistryRunKey component-ref', '<ComponentRef Id="RegistryRunKey" />');
regexTestIncludesNot('AutoLaunch feature', /<Feature Id="AutoLaunch" Title="Launch On Login" Level="2" .*>/);
regexTestIncludesNot('AutoUpdater feature', /<Feature Id="AutoUpdater" Title="Auto Updater" Level="3" .*>/);
regexTestIncludesNot('AutoUpdate feature', /<Feature Id="AutoUpdate" Title="Auto Update" Level="3" .*>/);
regexTestIncludesNot('Squirrel executable component-ref', /<ComponentRef Id="_msq.exe_.*" \/>/ );
testIncludesNot('Permission component-ref', `<ComponentRef Id="SetFolderPermissions" />`);
testIncludesNot('RegistryRunKey component-ref', '<ComponentRef Id="SetUninstallDisplayVersionPermissions" />');

describe('auto-updater', () => {
describe('auto-update', () => {
test('MSICreator includes Auto-Updater feature', async () => {
const msiCreator = new MSICreator({ ...defaultOptions, features: {autoUpdate: true, autoLaunch: false }});
const { wxsFile } = await msiCreator.create();
Expand All @@ -488,7 +488,7 @@ describe('auto-updater', () => {
testIncludes('PermissionEx call', '<util:PermissionEx User="[UPDATERUSERGROUP]" GenericAll="yes" />');
testIncludes('Updater user group property', '<Property Id="UPDATERUSERGROUP" Value="Users" />');

regexTestIncludes('AutoUpdater feature', /<Feature Id="AutoUpdater" Title="Auto Updater" Level="3" .*>/);
regexTestIncludes('AutoUpdate feature', /<Feature Id="AutoUpdate" Title="Auto Update" Level="3" .*>/);
regexTestIncludes('Squirrel executable component-ref', /<ComponentRef Id="_msq.exe_.*" \/>/ );
testIncludes('Permission component-ref', `<ComponentRef Id="SetFolderPermissions" />`);
testIncludes('SetUninstallDisplayVersionPermissions component-ref', '<ComponentRef Id="SetUninstallDisplayVersionPermissions" />');
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/e2e-msi.ts
Expand Up @@ -100,7 +100,7 @@ describe('Electron WIX MSI', () => {

entryPoints.forEach((entryPoint) => {
it(`runs the correct binary via ${entryPoint.name}`, async () => {
await launch(paths.startMenuShortcut);
await launch(entryPoint.path);
expect(await runs(msiOptions.exe)).ok();
expect(await getProcessPath(msiOptions.exe)).to.be(paths.appExe);
await kill(msiOptions.exe);
Expand Down
2 changes: 1 addition & 1 deletion static/updater-feature.xml
@@ -1,4 +1,4 @@
<Feature Id="AutoUpdater" Title="Auto Updater" Level="3" Description="Installs an auto-updater component and sets necesssary file system permissions.">
<Feature Id="AutoUpdate" Title="Auto Update" Level="3" Description="Installs an auto-updater component and sets necesssary file system permissions.">
<!-- {{UpdaterComponentRefs}} -->
<ComponentRef Id="SetFolderPermissions" />
</Feature>

0 comments on commit 56264de

Please sign in to comment.