diff --git a/__tests__/delete.test.ts b/__tests__/delete.test.ts index a8208c7..e3f5e0f 100644 --- a/__tests__/delete.test.ts +++ b/__tests__/delete.test.ts @@ -1,26 +1,34 @@ import {Input, InputParams} from '../src/input' import {deleteVersions, finalIds} from '../src/delete' +jest.setTimeout(10000) describe('index tests -- call graphql', () => { - it('getVersionIds test -- get oldest version', done => { + it('finalIds test -- get oldest version', done => { const numVersions = 1 finalIds(getInput({numOldVersionsToDelete: numVersions})).subscribe(ids => { - expect(ids.length).toBeGreaterThanOrEqual(numVersions) + expect(ids.length).toBe(numVersions) done() }) }) - it('getVersionIds test -- get oldest 3 versions', done => { + it.skip('finalIds test -- get oldest 3 versions', done => { const numVersions = 3 - finalIds(getInput({numOldVersionsToDelete: numVersions})).subscribe(ids => { - expect(ids.length).toBeGreaterThanOrEqual(numVersions) + expect(ids.length).toBe(numVersions) done() }) }) - it('getVersionIds test -- supplied package version id', done => { + it.skip('finalIds test -- get oldest 110 versions', done => { + const numVersions = 110 + + finalIds(getInput({numOldVersionsToDelete: numVersions})).subscribe(ids => { + expect(ids.length).toBe(99), async () => done() + }) + }) + + it('finalIds test -- supplied package version id', done => { const suppliedIds = [ 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB', @@ -56,26 +64,26 @@ describe('index tests -- call graphql', () => { it.skip('deleteVersions test -- delete oldest version', done => { deleteVersions(getInput({numOldVersionsToDelete: 1})).subscribe( isSuccess => { - expect(isSuccess).toBe(true) - done() - } + expect(isSuccess) + }, + async () => done() ) }) it.skip('deleteVersions test -- delete 3 oldest versions', done => { deleteVersions(getInput({numOldVersionsToDelete: 3})).subscribe( isSuccess => { - expect(isSuccess).toBe(true) - done() - } + expect(isSuccess) + }, + async () => done() ) }) it.skip('deleteVersions test -- keep 5 versions', done => { - deleteVersions(getInput({minVersionsToKeep: 5})).subscribe(isSuccess => { + deleteVersions(getInput({minVersionsToKeep: 100})).subscribe(isSuccess => { expect(isSuccess).toBe(true) - done() - }) + }), + async () => done() }) }) @@ -83,9 +91,9 @@ const defaultInput: InputParams = { packageVersionIds: [], owner: 'namratajha', repo: 'only-pkg', - packageName: 'onlypkg.maven', + packageName: 'only-pkg', numOldVersionsToDelete: 1, - minVersionsToKeep: 1, + minVersionsToKeep: -1, ignoreVersions: RegExp('^$'), token: process.env.GITHUB_TOKEN as string } diff --git a/__tests__/version/delete-version.test.ts b/__tests__/version/delete-version.test.ts index a34bbbf..e93b486 100644 --- a/__tests__/version/delete-version.test.ts +++ b/__tests__/version/delete-version.test.ts @@ -5,7 +5,7 @@ const githubToken = process.env.GITHUB_TOKEN as string describe.skip('delete tests', () => { it('deletePackageVersion', async () => { const response = await deletePackageVersion( - 'MDE0OlBhY2thZ2VWZXJzaW9uNjg5OTU1', + 'PV_lADOGReZt84AEI7FzgDSHEI', githubToken ).toPromise() expect(response).toBe(true) @@ -14,9 +14,9 @@ describe.skip('delete tests', () => { it('deletePackageVersions', async () => { const response = await deletePackageVersions( [ - 'MDE0OlBhY2thZ2VWZXJzaW9uNjk4Mjc0', - 'MDE0OlBhY2thZ2VWZXJzaW9uNjk4Mjcx', - 'MDE0OlBhY2thZ2VWZXJzaW9uNjk4MjY3' + 'PV_lADOGReZt84AEI7FzgDSHDs', + 'PV_lADOGReZt84AEI7FzgDSHDY', + 'PV_lADOGReZt84AEI7FzgDSHC8' ], githubToken ).toPromise() diff --git a/__tests__/version/get-version.test.ts b/__tests__/version/get-version.test.ts index d3a2d72..42a94f2 100644 --- a/__tests__/version/get-version.test.ts +++ b/__tests__/version/get-version.test.ts @@ -14,14 +14,6 @@ describe('get versions tests -- call graphql', () => { }) }) - it('getOldestVersions -- succeeds for more than 100 versions', done => { - const numVersions = 110 - getOldestVersions({numVersions}).subscribe(result => { - expect(result.versions.length).toBe(100) - done() - }) - }) - it('getOldestVersions -- fails for invalid repo', done => { getOldestVersions({repo: 'actions-testin'}).subscribe({ error: err => { @@ -56,8 +48,8 @@ interface Params { const defaultParams = { owner: 'namratajha', - repo: 'only-pkg', - packageName: 'only-pkg', + repo: 'test-repo', + packageName: 'test-repo', numVersions: 1, startCursor: '', token: process.env.GITHUB_TOKEN as string diff --git a/dist/index.js b/dist/index.js index ac3d30a..ae63fbe 100644 --- a/dist/index.js +++ b/dist/index.js @@ -308,7 +308,6 @@ function queryForOldestVersions(owner, repo, packageName, numVersions, startCurs } })).pipe(operators_1.catchError((err) => { const msg = 'query for oldest version failed.'; - console.log(`numversions: ${numVersions} startCursor: ${startCursor}`); return rxjs_1.throwError(err.errors && err.errors.length > 0 ? `${msg} ${err.errors[0].message}` : `${msg} verify input parameters are correct`); diff --git a/package.json b/package.json index ca8b82d..b27e031 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ "scripts": { "format": "prettier --write **/*.ts", "format-check": "prettier --check **/*.ts", - "lint": "eslint src/**/*.ts", + "lint": "eslint src/**/*.ts --fix", + "lint-check": "eslint src/**/*.ts", "test": "jest", - "build": "npm run format-check && npm run lint && tsc", + "build": "npm run format-check && npm run lint-check && npm run test && tsc", "pack": "rm -rf ./lib ./dist && npm run build && ncc build" }, "repository": { diff --git a/src/version/get-versions.ts b/src/version/get-versions.ts index ee72d03..c285de4 100644 --- a/src/version/get-versions.ts +++ b/src/version/get-versions.ts @@ -109,7 +109,6 @@ export function queryForOldestVersions( ).pipe( catchError((err: GraphQlQueryResponse) => { const msg = 'query for oldest version failed.' - console.log(`numversions: ${numVersions} startCursor: ${startCursor}`) return throwError( err.errors && err.errors.length > 0 ? `${msg} ${err.errors[0].message}`