Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump @types/jest from 25.2.3 to 29.5.2 #124

Merged
merged 3 commits into from
Aug 15, 2023
Merged

Bump @types/jest from 25.2.3 to 29.5.2 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
defb11d
Bump @types/jest from 25.2.3 to 29.5.2
dependabot[bot] Jun 5, 2023
ad14c11
Merge branch 'master' into dependabot/npm_and_yarn/types/jest-29.5.2
shazron Aug 15, 2023
538f544
fix: update eslint-config, fix eslint test issues
shazron Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,14 @@
"extends": ["@adobe/eslint-config-aio-lib-config"],
"globals": {
"NodeJS": true
},
"rules": {
"jsdoc/tag-lines": [
"error",
"never",
{
"startLines": null
}
]
}
}
2 changes: 1 addition & 1 deletion lib/Files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ class Files {
* @param {Function} [options.progressCallback] a function that will be called every
* time the operation completes on a single file,the srcPath and destPath to the copied
* file are passed as argument to the callback `progressCallback(srcPath, destPath)`
* @returns {Promise<object<string, string>>} returns a promise resolving to an object
* @returns {Promise<Object<string, string>>} returns a promise resolving to an object
* containing all copied files from src to dest `{ srcFilePath: destFilePath }`
* @memberof Files
*/
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
"adobe-io"
],
"devDependencies": {
"@adobe/eslint-config-aio-lib-config": "^2.0.0",
"@types/jest": "^25.1.0",
"eslint": "^8.46.0",
"@adobe/eslint-config-aio-lib-config": "^2.0.1",
"@types/jest": "^29.5.2",
"eslint": "^8.47.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jest": "^23.20.0",
"eslint-plugin-jsdoc": "^37.9.7",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-jest": "^27.2.3",
"eslint-plugin-jsdoc": "^42.0.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^4.0.1",
Expand Down
5 changes: 2 additions & 3 deletions test/Files.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ describe('copy', () => {
try {
await files.copy(fakeSrcFile, fakeDestFile, { localSrc: true })
} catch (e) {
// eslint-disable-next-line jest/no-try-expect
// eslint-disable-next-line jest/no-conditional-expect
expect(e).toEqual(fakeError)
}
})
Expand All @@ -998,7 +998,7 @@ describe('copy', () => {
try {
await files.copy(fakeSrcFile, fakeDestFile, { localDest: true })
} catch (e) {
// eslint-disable-next-line jest/no-try-expect
// eslint-disable-next-line jest/no-conditional-expect
expect(e).toEqual(fakeError)
}
})
Expand Down Expand Up @@ -1088,7 +1088,6 @@ describe('revokeAllPresignURLs', () => {

afterAll(() => {
revokePresignUrlMock.mockRestore()
// initWithNewCredsMock.mockRestore()
})

test('call revoke', async () => {
Expand Down
1 change: 0 additions & 1 deletion test/impl/AzureBlobFiles.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ const fakeCustomAccessPolicy = '<?xml version="1.0" encoding="utf-8"?><SignedIde
const DEFAULT_CDN_STORAGE_HOST = 'https://firefly.azureedge.net'

beforeEach(async () => {
expect.hasAssertions()
jest.clearAllMocks()
})

Expand Down
3 changes: 1 addition & 2 deletions test/init.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const TvmClient = require('@adobe/aio-lib-core-tvm')
jest.mock('@adobe/aio-lib-core-tvm')

beforeEach(async () => {
expect.hasAssertions()
jest.restoreAllMocks()
})

Expand Down Expand Up @@ -146,7 +145,7 @@ describe('init', () => {
try {
await filesLib.init({ ow: fakeOWCreds })
} catch (e) {
// eslint-disable-next-line jest/no-try-expect
// eslint-disable-next-line jest/no-conditional-expect
expect(e).toBe(tvmError)
}
})
Expand Down