fix: use correct downloaded xpi file path (#124)

* fix: use correct downloaded xpi file path * test: use path to downloaded file directly * refactor: remove unneeded var
tophat · Apr 20, 2020 · 1b41d0c · 1b41d0c
1 parent 14ee1b8
commit 1b41d0c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/src/publish.js b/src/publish.js
@@ -26,11 +26,8 @@ const publish = async options => {
     const { FIREFOX_API_KEY, FIREFOX_SECRET_KEY } = process.env
 
     const signAddon = async params => {
-        const unsignedXpiFile = `unsigned-${targetXpi}`
-        fs.writeFileSync(
-            path.join(artifactsDir, unsignedXpiFile),
-            fs.readFileSync(params.xpiPath),
-        )
+        const unsignedXpiFile = path.join(artifactsDir, `unsigned-${targetXpi}`)
+        fs.writeFileSync(unsignedXpiFile, fs.readFileSync(params.xpiPath))
         const result = await defaultAddonSigner(params)
         if (
             channel === allowedChannels.LISTED &&
@@ -55,10 +52,7 @@ const publish = async options => {
         { signAddon },
     )
     const [xpiFile] = downloadedFiles
-    fs.renameSync(
-        path.join(artifactsDir, xpiFile),
-        path.join(artifactsDir, targetXpi),
-    )
+    fs.renameSync(xpiFile, path.join(artifactsDir, targetXpi))
 }
 
 module.exports = {

diff --git a/tests/publish.test.js b/tests/publish.test.js
@@ -90,15 +90,16 @@ describe('publish', () => {
     it('renames downloaded file to target xpi', async () => {
         const downloadedFile = 'mock_downloaded.xpi'
         const mockFileContent = 'some fake signed xpi'
+        const downloadedFilePath = path.join(
+            mockOptions.artifactsDir,
+            downloadedFile,
+        )
         vol.fromJSON({
-            [path.join(
-                mockOptions.artifactsDir,
-                downloadedFile,
-            )]: mockFileContent,
+            [downloadedFilePath]: mockFileContent,
         })
         signAddon.mockResolvedValueOnce({
             ...mockAddonSignSuccess,
-            downloadedFiles: [downloadedFile],
+            downloadedFiles: [downloadedFilePath],
         })
         const targetXpiPath = path.join(mockOptions.artifactsDir, targetXpi)
         expect(fs.existsSync(targetXpiPath)).toBe(false)