From 2304b98260b07a889b1c4fb2292701950a1724ad Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Thu, 11 Apr 2019 00:30:54 +0900
Subject: [PATCH] refs #850 Fix spec for Modals
---
.../Modals/AddListMember.spec.ts | 6 ++--
.../TimelineSpace/Modals/ImageViewer.spec.ts | 4 +--
.../Modals/ListMembership.spec.ts | 32 +++++++++++++++----
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts b/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
index 5f5c1b06..67ae6446 100644
--- a/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
@@ -2,7 +2,7 @@ import { Response, Account } from 'megalodon'
import mockedMegalodon from '~/spec/mock/megalodon'
import { createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'
-import AddListMember from '~/src/renderer/store/TimelineSpace/Modals/AddListMember'
+import AddListMember, { AddListMemberState } from '@/store/TimelineSpace/Modals/AddListMember'
jest.mock('megalodon')
@@ -28,7 +28,7 @@ const account: Account = {
bot: false
}
-const state = () => {
+const state = (): AddListMemberState => {
return {
modalOpen: false,
accounts: [],
@@ -121,7 +121,7 @@ describe('AddListMember', () => {
mockedMegalodon.mockImplementation(() => mockClient)
const result = await store.dispatch('AddListMember/add', 'akira')
- expect(result.data).toEqual({})
+ expect(result).toEqual({})
})
})
})
diff --git a/spec/renderer/integration/store/TimelineSpace/Modals/ImageViewer.spec.ts b/spec/renderer/integration/store/TimelineSpace/Modals/ImageViewer.spec.ts
index 52681ee3..b3a3a21d 100644
--- a/spec/renderer/integration/store/TimelineSpace/Modals/ImageViewer.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Modals/ImageViewer.spec.ts
@@ -1,8 +1,8 @@
import { createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'
-import ImageViewer from '~/src/renderer/store/TimelineSpace/Modals/ImageViewer'
+import ImageViewer, { ImageViewerState } from '~/src/renderer/store/TimelineSpace/Modals/ImageViewer'
-const state = () => {
+const state = (): ImageViewerState => {
return {
modalOpen: false,
currentIndex: -1,
diff --git a/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts b/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
index 8e8003d7..843e95c0 100644
--- a/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
+++ b/spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
@@ -1,11 +1,33 @@
-import { Response, List } from 'megalodon'
+import { Response, List, Account } from 'megalodon'
import mockedMegalodon from '~/spec/mock/megalodon'
import { createLocalVue } from '@vue/test-utils'
import Vuex from 'vuex'
-import ListMembership from '~/src/renderer/store/TimelineSpace/Modals/ListMembership'
+import ListMembership, { ListMembershipState } from '@/store/TimelineSpace/Modals/ListMembership'
jest.mock('megalodon')
+const account: Account = {
+ id: 1,
+ username: 'h3poteto',
+ acct: 'h3poteto@pleroma.io',
+ display_name: 'h3poteto',
+ locked: false,
+ created_at: '2019-03-26T21:30:32',
+ followers_count: 10,
+ following_count: 10,
+ statuses_count: 100,
+ note: 'engineer',
+ url: 'https://pleroma.io',
+ avatar: '',
+ avatar_static: '',
+ header: '',
+ header_static: '',
+ emojis: [],
+ moved: null,
+ fields: null,
+ bot: false
+}
+
const list1: List = {
id: 1,
title: 'list1'
@@ -16,7 +38,7 @@ const list2: List = {
title: 'list2'
}
-let state: any = () => {
+let state = (): ListMembershipState => {
return {
modalOpen: false,
account: null,
@@ -116,9 +138,7 @@ describe('ListMembership', () => {
state = () => {
return {
modalOpen: false,
- account: {
- id: 65
- },
+ account: account,
lists: [],
belongToLists: [
list2