actions/create-pull-request
1
0
Fork 0
mirror of https://forgejo.stefka.eu/jiriks74/create-pull-request.git synced 2025-01-18 16:01:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(test): change expects due gitignore in test infra

Browse source
This commit is contained in:
Marco Lecheler 2023-06-23 15:22:01 +02:00
parent 183ff16ab9
commit 279823883b
No known key found for this signature in database
GPG key ID: 91BA632DE070124A
1 changed files with 15 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
__test__/create-or-update-branch.int.test.ts
View file

@ -27,7 +27,7 @@ const FORK_REMOTE_NAME = 'fork'
const ADD_PATHS_DEFAULT = [] const ADD_PATHS_DEFAULT = []
const ADD_PATHS_MULTI = ['a', 'b'] const ADD_PATHS_MULTI = ['a', 'b']
const ADD_PATHS_WILDCARD = ['a/*.txt', 'b/*.txt'] const ADD_PATHS_WILDCARD = ['a/*.txt']
async function createFile(filename: string, content?: string): Promise<string> { async function createFile(filename: string, content?: string): Promise<string> {
const _content = content ? content : uuidv4() const _content = content ? content : uuidv4()
@ -297,11 +297,9 @@ describe('create-or-update-branch tests', () => {
ADD_PATHS_DEFAULT ADD_PATHS_DEFAULT
) )
await git.checkout(BRANCH) await git.checkout(BRANCH)
expect(result.action).toEqual('created') expect(result.action).toEqual('none')
expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent) expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
// Push pull request branch to remote // Push pull request branch to remote
await git.push([ await git.push([
@ -326,12 +324,10 @@ describe('create-or-update-branch tests', () => {
ADD_PATHS_DEFAULT ADD_PATHS_DEFAULT
) )
await git.checkout(BRANCH) await git.checkout(BRANCH)
expect(_result.action).toEqual('updated') expect(_result.action).toEqual('not-updated')
expect(_result.hasDiffWithBase).toBeTruthy() expect(_result.hasDiffWithBase).toBeFalsy()
expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent) expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([_commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
}) })
it('tests create and update with identical changes', async () => { it('tests create and update with identical changes', async () => {
@ -1182,11 +1178,9 @@ describe('create-or-update-branch tests', () => {
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE]) await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy() ).toBeTruthy()
await git.checkout(BRANCHB) await git.checkout(BRANCHB)
expect(resultB.action).toEqual('created') expect(resultB.action).toEqual('none')
expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked) expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
// Delete the local branches // Delete the local branches
await git.checkout(DEFAULT_BRANCH) await git.checkout(DEFAULT_BRANCH)
@ -1289,11 +1283,9 @@ describe('create-or-update-branch tests', () => {
ADD_PATHS_DEFAULT ADD_PATHS_DEFAULT
) )
await git.checkout(BRANCH) await git.checkout(BRANCH)
expect(result.action).toEqual('created') expect(result.action).toEqual('none')
expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent) expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
// Push pull request branch to remote // Push pull request branch to remote
await git.push([ await git.push([
@ -1321,12 +1313,10 @@ describe('create-or-update-branch tests', () => {
ADD_PATHS_DEFAULT ADD_PATHS_DEFAULT
) )
await git.checkout(BRANCH) await git.checkout(BRANCH)
expect(_result.action).toEqual('updated') expect(_result.action).toEqual('not-updated')
expect(_result.hasDiffWithBase).toBeTruthy() expect(_result.hasDiffWithBase).toBeFalsy()
expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent) expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([_commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
}) })
it('tests create and update with identical changes (WBNB)', async () => { it('tests create and update with identical changes (WBNB)', async () => {
@ -2213,11 +2203,9 @@ describe('create-or-update-branch tests', () => {
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE]) await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy() ).toBeTruthy()
await git.checkout(BRANCHB) await git.checkout(BRANCHB)
expect(resultB.action).toEqual('created') expect(resultB.action).toEqual('none')
expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked) expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
expect( expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
).toBeTruthy()
// Delete the local branches // Delete the local branches
await git.checkout(DEFAULT_BRANCH) await git.checkout(DEFAULT_BRANCH)