fix(windows): do not rename artifacts twice

develar · develar · commit 9c87ffd49fd7 · 2016-03-03T17:19:03.000+01:00
PR is required to fix windows-installer — blocked on electron/windows-installer#22
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "bluebird": "^3.3.3",
     "command-line-args": "^2.1.6",
     "electron-packager-tf": "^5.2.3",
-    "electron-winstaller-temp-fork": "^2.0.5-beta.0",
+    "electron-winstaller-temp-fork": "^2.0.5-beta.2",
     "fs-extra": "^0.26.5",
     "gm": "^1.21.1",
     "hosted-git-info": "^2.1.4",
diff --git a/src/winPackager.ts b/src/winPackager.ts
@@ -105,6 +105,7 @@ export default class WinPackager extends PlatformPackager<any> {
       setupIcon: path.join(this.buildResourcesDir, "icon.ico"),
       certificateFile: certificateFile,
       certificatePassword: this.options.cscKeyPassword,
+      fixUpPaths: false
     }, this.customDistOptions)
 
     if (this.isNsis) {
@@ -134,7 +135,7 @@ export default class WinPackager extends PlatformPackager<any> {
     }
 
     return await BluebirdPromise.all([
-      renameFile(path.join(installerOutDir, appName + "Setup.exe"), installerExePath)
+      renameFile(path.join(installerOutDir, "Setup.exe"), installerExePath)
         .then(it => this.dispatchArtifactCreated(it)),
       renameFile(path.join(installerOutDir, appName + "-" + version + "-full.nupkg"), path.join(installerOutDir, appName + "-" + version + archSuffix + "-full.nupkg"))
         .then(it => this.dispatchArtifactCreated(it))
diff --git a/test/BuildTest.js b/test/BuildTest.js
@@ -35,7 +35,10 @@ test("custom app dir", async function () {
     platforms = ["win32"]
   }
 
-  await assertPack("test-app-one", platforms, [], true, async projectDir => {
+  await assertPack("test-app-one", platforms, {
+    // speed up tests, we don't need check every arch
+    arch: process.arch
+  }, true, async projectDir => {
     const file = path.join(projectDir, "package.json")
     const data = parseJson(await readText(file))
     data.directories = {
diff --git a/test/helpers/packTester.js b/test/helpers/packTester.js
@@ -14,7 +14,7 @@ import pathSorter from "path-sort"
 const copyDir = Promise.promisify(fse.copy)
 const tmpDir = Promise.promisify(tmp.dir)
 
-export async function assertPack(projectDir, platform, target, useTempDir, tempDirCreated) {
+export async function assertPack(projectDir, platform, packagerOptions, useTempDir, tempDirCreated) {
   projectDir = path.join(__dirname, "..", "fixtures", projectDir)
   // const isDoNotUseTempDir = platform === "darwin"
   if (useTempDir) {
@@ -36,14 +36,13 @@ export async function assertPack(projectDir, platform, target, useTempDir, tempD
     }
   }
 
-  const packager = new Packager({
+  const packager = new Packager(Object.assign({
     projectDir: projectDir,
     cscLink: CSC_LINK,
     cscKeyPassword: CSC_KEY_PASSWORD,
     dist: true,
     platform: Array.isArray(platform) ? platform : [platform],
-    target: target
-  })
+  }, packagerOptions))
 
   await packager.build()
   if (platform === "darwin" || (platform === "all" && process.platform === "darwin")) {
diff --git a/test/winPackagerTest.js b/test/winPackagerTest.js
@@ -7,5 +7,7 @@ test.ifNotTravis("win", async function () {
 
 // nsis is deprecated and not thread-safe - just do not run on CI to avoid failures
 test.ifNotCi.serial("win: nsis", async function () {
-  await assertPack("test-app-one", "win32", ["nsis"], true)
+  await assertPack("test-app-one", "win32", {
+    target: ["nsis"]
+  }, true)
 })
