fix: use correct fish_user_paths env variable (#356)

tophat · Apr 6, 2019 · 033b460 · 033b460
1 parent 3b8a9a8
commit 033b460
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/util/path.js b/src/util/path.js
@@ -12,7 +12,7 @@ export const getPathDelimiter = shell => {
 
 export const getCurrentPath = shell => {
     if (isFishShell(shell)) {
-        return process.env.FISH_USER_PATHS || ''
+        return process.env.fish_user_paths || ''
     }
     return process.env.PATH || ''
 }

diff --git a/test/commands/current.test.js b/test/commands/current.test.js
@@ -37,7 +37,7 @@ describe('yvm current command', () => {
         )
     })
     it('fails if fish environment path is not available', async () => {
-        delete process.env.FISH_USER_PATHS
+        delete process.env.fish_user_paths
         expect(await current({ shell: 'fish' })).toBe(1)
         expect(log).toHaveBeenCalledWith(
             expect.stringContaining(`PATH not found`),

diff --git a/test/util/alias.test.js b/test/util/alias.test.js
@@ -72,26 +72,26 @@ describe('alias', () => {
 
         it('gets first non yvm yarn executable in fish shell', async () => {
             const yvmPath = '/Users/tophat/.yvm'
-            const oldPath = process.env.FISH_USER_PATHS
-            process.env.FISH_USER_PATHS = `${yvmPath}/versions/v1.13.0/bin /usr/local/bin:`
+            const oldPath = process.env.fish_user_paths
+            process.env.fish_user_paths = `${yvmPath}/versions/v1.13.0/bin /usr/local/bin:`
             childProcess.execSync.mockReturnValueOnce('1.14.0')
             expect(
                 await alias.resolveSystem({ shell: 'fish', yvmPath }),
             ).toEqual('1.14.0')
             expect(childProcess.execSync).toHaveBeenCalledWith(
                 expect.stringContaining('usr/local/bin/yarn'),
             )
-            process.env.FISH_USER_PATHS = oldPath
+            process.env.fish_user_paths = oldPath
         })
 
         it('returns nothing if yarn not found in fish user path', async () => {
-            const oldPath = process.env.FISH_USER_PATHS
-            process.env.FISH_USER_PATHS =
+            const oldPath = process.env.fish_user_paths
+            process.env.fish_user_paths =
                 '/Users/tophat/.nvm/versions/node/v6.11.5/bin '
             expect(
                 await alias.resolveSystem({ shell: 'fish', yvmPath }),
             ).toEqual(alias.NOT_AVAILABLE)
-            process.env.FISH_USER_PATHS = oldPath
+            process.env.fish_user_paths = oldPath
         })
     })