Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1765 from h3poteto/fix/jest-types 

Fix types in integration spec
This commit is contained in:
AkiraFukushima 2020-09-13 17:30:40 +09:00 committed by GitHub
parent 3bbc6498fa c47fb2b749
commit 03798916c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -214,7 +214,7 @@
"@types/auto-launch": "^5.0.1",
"@types/electron-json-storage": "^4.0.0",
"@types/i18next": "^13.0.0",
"@types/jest": "25.1.4",
"@types/jest": "26.0.13",
"@types/lodash": "^4.14.160",
"@types/nedb": "^1.8.10",
"@types/node": "^14.0.27",

2
spec/renderer/integration/store/Login.spec.ts
View File

@ -6,7 +6,7 @@ import { MyWindow } from '~/src/types/global'
;((window as any) as MyWindow).ipcRenderer = ipcRenderer
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
detector: jest.fn(() => 'pleroma'),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace.spec.ts
View File

@ -66,7 +66,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
detector: jest.fn(() => 'pleroma'),
default: jest.fn(() => mockClient),
__esModule: true

2
spec/renderer/integration/store/TimelineSpace/Contents/DirectMessages.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Favourites.spec.ts
View File

@ -19,7 +19,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/FollowRequests.spec.ts
View File

@ -41,7 +41,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Hashtag/Tag.spec.ts
View File

@ -19,7 +19,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Home.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Lists/Edit.spec.ts
View File

@ -30,7 +30,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Lists/Index.spec.ts
View File

@ -29,7 +29,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Lists/Show.spec.ts
View File

@ -19,7 +19,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Local.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Mentions.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Notifications.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Public.spec.ts
View File

@ -18,7 +18,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Search/Account.spec.ts
View File

@ -40,7 +40,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Search/Tag.spec.ts
View File

@ -28,7 +28,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Contents/Search/Toots.spec.ts
View File

@ -22,7 +22,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/HeaderMenu.spec.ts
View File

@ -23,7 +23,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
View File

@ -29,7 +29,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
View File

@ -59,7 +59,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

2
spec/renderer/integration/store/TimelineSpace/SideMenu.spec.ts
View File

@ -22,7 +22,7 @@ const mockClient = {
}
jest.mock('megalodon', () => ({
...jest.requireActual('megalodon'),
...jest.requireActual<object>('megalodon'),
default: jest.fn(() => mockClient),
__esModule: true
}))

14
yarn.lock
View File

@ -1336,15 +1336,7 @@
dependencies:
"@types/istanbul-lib-report" "*"
"@types/jest@25.1.4":
version "25.1.4"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.1.4.tgz#9e9f1e59dda86d3fd56afce71d1ea1b331f6f760"
integrity sha512-QDDY2uNAhCV7TMCITrxz+MRk1EizcsevzfeS6LykIlq2V1E5oO4wXG8V2ZEd9w7Snxeeagk46YbMgZ8ESHx3sw==
dependencies:
jest-diff "^25.1.0"
pretty-format "^25.1.0"
"@types/jest@26.x":
"@types/jest@26.0.13", "@types/jest@26.x":
version "26.0.13"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e"
integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA==
@ -7470,7 +7462,7 @@ jest-config@^26.4.2:
micromatch "^4.0.2"
pretty-format "^26.4.2"
jest-diff@^25.1.0, jest-diff@^25.2.1:
jest-diff@^25.2.1:
version "25.5.0"
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
@ -10213,7 +10205,7 @@ pretty-error@^2.1.1:
renderkid "^2.0.1"
utila "~0.4"
pretty-format@^25.1.0, pretty-format@^25.2.1, pretty-format@^25.5.0:
pretty-format@^25.2.1, pretty-format@^25.5.0:
version "25.5.0"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==