Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 14:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply default lock options before setting lock (#5320)

Browse Source
This commit is contained in:
Pim 2019-03-21 21:07:50 +01:00 committed by Pooya Parsa
parent 3153e89645
commit 7c24280a7a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/utils/src/locking.js
View File

@ -40,6 +40,7 @@ export async function lock({ id, dir, root, options }) {
consola.fatal(`A lock with id '${id}' already exists on ${dir}`) consola.fatal(`A lock with id '${id}' already exists on ${dir}`)
} }
options = getLockOptions(options)
const release = await properlock.lock(lockPath, options) const release = await properlock.lock(lockPath, options)
if (!release) { if (!release) {

19
packages/utils/test/locking.test.js
View File

@ -18,16 +18,16 @@ describe('util: locking', () => {
beforeEach(() => jest.resetAllMocks()) beforeEach(() => jest.resetAllMocks())
beforeEach(() => lockPaths.clear()) beforeEach(() => lockPaths.clear())
test('onCompromised lock is warn error by default', () => { test('onCompromised lock warns on compromise by default', () => {
defaultLockOptions.onCompromised() defaultLockOptions.onCompromised()
expect(consola.warn).toHaveBeenCalledTimes(1) expect(consola.warn).toHaveBeenCalledTimes(1)
}) })
test('can override default options', () => { test('can override default options', () => {
const options = getLockOptions({ onCompromised: err => consola.warn(err) }) const options = getLockOptions({ onCompromised: err => consola.fatal(err) })
options.onCompromised() options.onCompromised()
expect(consola.warn).toHaveBeenCalledTimes(1) expect(consola.fatal).toHaveBeenCalledTimes(1)
}) })
test('createLockPath creates the same lockPath for identical locks', () => { test('createLockPath creates the same lockPath for identical locks', () => {
@ -143,4 +143,17 @@ describe('util: locking', () => {
expect(fs.removeSync).toHaveBeenCalledWith(path1) expect(fs.removeSync).toHaveBeenCalledWith(path1)
expect(fs.removeSync).toHaveBeenCalledWith(path2) expect(fs.removeSync).toHaveBeenCalledWith(path2)
}) })
test('lock uses setLockOptions to set defaults', async () => {
const spy = properlock.lock.mockImplementationOnce(() => true)
await lock(lockConfig)
expect(spy).toHaveBeenCalledWith(expect.any(String), expect.any(Object))
const options = spy.mock.calls[0][1]
expect(options.stale).toBeDefined()
expect(options.onCompromised).toBeDefined()
expect(() => options.onCompromised()).not.toThrow()
expect(consola.fatal).not.toHaveBeenCalled()
})
}) })