Skip to content
Permalink
Browse files

fix(maker): fix the squirrel maker app name logic

  • Loading branch information
MarshallOfSound authored and malept committed Mar 7, 2017
1 parent df16202 commit 84031ecb81ce0a4657ff1591207f6c4e40c235ab
Showing with 4 additions and 3 deletions.
  1. +2 −1 src/makers/win32/squirrel.js
  2. +2 −2 test/slow/api_spec_slow.js
@@ -9,8 +9,9 @@ export default async (dir, appName, targetArch, forgeConfig, packageJSON) => { /
await ensureDirectory(outPath);

const winstallerConfig = Object.assign({
name: packageJSON.name,
name: appName,
noMsi: true,
exe: `${appName}.exe`,
}, forgeConfig.electronWinstallerConfig, {
appDirectory: dir,
outputDirectory: outPath,
@@ -173,14 +173,14 @@ describe(`electron-forge API (with installer=${installer.substr(12)})`, () => {
});

describe('after package', () => {
let resourcesPath = 'electron-forge-test.app/Contents/Resources';
let resourcesPath = 'Test App.app/Contents/Resources';
if (process.platform !== 'darwin') {
resourcesPath = 'resources';
}

it('should have deleted the forge config from the packaged app', async () => {
const cleanPackageJSON = await readPackageJSON(
path.resolve(dir, 'out', `electron-forge-test-${process.platform}-${process.arch}`, resourcesPath, 'app')
path.resolve(dir, 'out', `Test App-${process.platform}-${process.arch}`, resourcesPath, 'app')
);
expect(cleanPackageJSON).to.not.have.deep.property('config.forge');
});

0 comments on commit 84031ec

Please sign in to comment.
You can’t perform that action at this time.