Merge branch 'dev' into releases/v3

This commit is contained in:
James Ives 2020-05-24 12:20:43 -04:00
commit 0782f2086c
2 changed files with 3 additions and 3 deletions

View File

@ -439,7 +439,7 @@ describe('git', () => {
}) })
const response = await deploy(action) const response = await deploy(action)
expect(execute).toBeCalledTimes(14) expect(execute).toBeCalledTimes(13)
expect(rmRF).toBeCalledTimes(1) expect(rmRF).toBeCalledTimes(1)
expect(response).toBe(Status.SKIPPED) expect(response).toBe(Status.SKIPPED)
}) })
@ -461,7 +461,7 @@ describe('git', () => {
try { try {
await deploy(action) await deploy(action)
} catch (e) { } catch (e) {
expect(execute).toBeCalledTimes(2) expect(execute).toBeCalledTimes(1)
expect(rmRF).toBeCalledTimes(1) expect(rmRF).toBeCalledTimes(1)
expect(e.message).toMatch( expect(e.message).toMatch(
'The deploy step encountered an error: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌' 'The deploy step encountered an error: No deployment token/method was provided. You must provide the action with either a Personal Access Token or the GitHub Token secret in order to deploy. If you wish to use an ssh deploy token then you must set SSH to true. ❌'

View File

@ -47,7 +47,7 @@ describe('main', () => {
debug: true debug: true
}) })
await run(action) await run(action)
expect(execute).toBeCalledTimes(20) expect(execute).toBeCalledTimes(19)
expect(rmRF).toBeCalledTimes(1) expect(rmRF).toBeCalledTimes(1)
expect(exportVariable).toBeCalledTimes(1) expect(exportVariable).toBeCalledTimes(1)
}) })