fix(maker): fix dmg output path and add test to enforce in future

electron · May 3, 2017 · a41d6db · a41d6db
1 parent 2dffd3c
commit a41d6db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/makers/darwin/dmg.js b/src/makers/darwin/dmg.js
@@ -1,3 +1,4 @@
+import fs from 'fs-promise';
 import path from 'path';
 import pify from 'pify';
 
@@ -11,7 +12,8 @@ export const isSupportedOnCurrentPlatform = async () => process.platform === 'da
 export default async ({ dir, appName, targetArch, forgeConfig, packageJSON }) => {
  const electronDMG = require('electron-installer-dmg');
 
- const outPath = path.resolve(dir, '../make', `${appName}-${packageJSON.version}.dmg`);
+ const outPath = path.resolve(dir, '../make', `${appName}.dmg`);
+ const wantedOutPath = path.resolve(dir, '../make', `${appName}-${packageJSON.version}.dmg`);
  await ensureFile(outPath);
  const dmgConfig = Object.assign({
  overwrite: true,
@@ -21,5 +23,6 @@ export default async ({ dir, appName, targetArch, forgeConfig, packageJSON }) =>
  out: path.dirname(outPath),
  });
  await pify(electronDMG)(dmgConfig);
- return [outPath];
+ await fs.rename(outPath, wantedOutPath);
+ return [wantedOutPath];
 };
diff --git a/test/slow/api_spec_slow.js b/test/slow/api_spec_slow.js
@@ -238,7 +238,12 @@ describe(`electron-forge API (with installer=${installer.substr(12)})`, () => {
  for (const optionsFetcher of options) {
  if (shouldPass) {
  it(`successfully makes for config: ${JSON.stringify(optionsFetcher(), 2)}`, async () => {
- await forge.make(optionsFetcher());
+ const outputs = await forge.make(optionsFetcher());
+ for (const outputArr of outputs) {
+ for (const output of outputArr) {
+ expect(await fs.exists(output)).to.equal(true);
+ }
+ }
  });
  } else {
  it(`fails for config: ${JSON.stringify(optionsFetcher(), 2)}`, async () => {