Skip to content

Commit b160c8b

Browse files
committed
Make task tests more relevant
1 parent 9502482 commit b160c8b

File tree

1 file changed

+24
-63
lines changed

1 file changed

+24
-63
lines changed

tests/task.test.ts

Lines changed: 24 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ const index2 = {
1616
uid: 'movies_test2',
1717
}
1818

19+
const index3 = {
20+
uid: 'movies_test2',
21+
}
22+
1923
jest.setTimeout(100 * 1000)
2024

2125
afterAll(() => {
@@ -72,17 +76,7 @@ describe.each([{ permission: 'Master' }, { permission: 'Private' }])(
7276
const task = await client.index(index.uid).getTask(enqueuedTask.taskUid)
7377

7478
expect(task.indexUid).toEqual(index.uid)
75-
expect(task.status).toEqual(TaskStatus.TASK_SUCCEEDED)
76-
expect(task.type).toEqual(TaskTypes.DOCUMENTS_ADDITION_OR_UPDATE)
77-
expect(task.enqueuedAt).toBeDefined()
7879
expect(task.uid).toEqual(enqueuedTask.taskUid)
79-
expect(task).toHaveProperty('details')
80-
expect(task.details.indexedDocuments).toEqual(7)
81-
expect(task.details.receivedDocuments).toEqual(7)
82-
expect(task.duration).toBeDefined()
83-
expect(task.enqueuedAt).toBeDefined()
84-
expect(task.finishedAt).toBeDefined()
85-
expect(task.startedAt).toBeDefined()
8680
})
8781

8882
test(`${permission} key: Get all tasks`, async () => {
@@ -94,32 +88,15 @@ describe.each([{ permission: 'Master' }, { permission: 'Private' }])(
9488

9589
const tasks = await client.getTasks()
9690

97-
expect(tasks.results[0]).toHaveProperty(
98-
'status',
99-
TaskStatus.TASK_SUCCEEDED
100-
)
101-
expect(tasks.results[0].indexUid).toEqual(index.uid)
102-
expect(tasks.results[0].status).toEqual(TaskStatus.TASK_SUCCEEDED)
103-
expect(tasks.results[0].type).toEqual(
104-
TaskTypes.DOCUMENTS_ADDITION_OR_UPDATE
105-
)
106-
expect(tasks.results[0].enqueuedAt).toBeDefined()
107-
expect(tasks.results[0].uid).toBeDefined()
108-
expect(tasks.results[0].type).toEqual(
109-
TaskTypes.DOCUMENTS_ADDITION_OR_UPDATE
110-
)
111-
expect(tasks.results[0].duration).toBeDefined()
112-
expect(tasks.results[0].finishedAt).toBeDefined()
113-
expect(tasks.results[0].startedAt).toBeDefined()
91+
expect(tasks.results).toBeInstanceOf(Array)
92+
expect(tasks.results[0].uid).toEqual(enqueuedTask.taskUid)
11493
})
11594

11695
test(`${permission} key: Get all tasks with type filter`, async () => {
11796
const client = await getClient(permission)
118-
const task1 = await client.index(index.uid).addDocuments([{ id: 1 }])
119-
await client.waitForTask(task1.taskUid)
120-
121-
const task2 = await client.index(index.uid).deleteDocument(1)
122-
await client.waitForTask(task2.taskUid)
97+
await client.index(index.uid).addDocuments([{ id: 1 }])
98+
await client.index(index.uid).deleteDocument(1)
99+
await client.createIndex(index2.uid)
123100

124101
const tasks = await client.getTasks({
125102
type: [
@@ -136,27 +113,26 @@ describe.each([{ permission: 'Master' }, { permission: 'Private' }])(
136113

137114
test(`${permission} key: Get all tasks with status filter`, async () => {
138115
const client = await getClient(permission)
139-
const enqueuedTask = await client
140-
.index(index.uid)
141-
.addDocuments([{ id: 1 }])
142-
await client.waitForTask(enqueuedTask.taskUid)
116+
const task1 = await client.index(index.uid).addDocuments([{ id: 1 }])
117+
const task2 = await client.index(index.uid).addDocuments([{}])
118+
await client.waitForTask(task1.taskUid)
119+
await client.waitForTask(task2.taskUid)
143120

144121
const tasks = await client.getTasks({
145122
status: [TaskStatus.TASK_SUCCEEDED, TaskStatus.TASK_FAILED],
146123
})
147-
const onlySuccesFullTasks = new Set(
124+
const onlySuccesfullTasks = new Set(
148125
tasks.results.map((task) => task.status)
149126
)
150127

151-
expect(onlySuccesFullTasks.size).toEqual(2)
128+
expect(onlySuccesfullTasks.size).toEqual(2)
152129
})
153130

154131
test(`${permission} key: Get all tasks with indexUid filter`, async () => {
155132
const client = await getClient(permission)
156-
const task1 = await client.index(index.uid).addDocuments([{ id: 1 }])
157-
const task2 = await client.index(index2.uid).addDocuments([{ id: 1 }])
158-
await client.waitForTask(task1.taskUid)
159-
await client.waitForTask(task2.taskUid)
133+
await client.index(index.uid).addDocuments([{ id: 1 }])
134+
await client.index(index2.uid).addDocuments([{ id: 1 }])
135+
await client.index(index3.uid).addDocuments([{ id: 1 }])
160136

161137
const tasks = await client.getTasks({
162138
indexUid: [index.uid, index2.uid],
@@ -170,30 +146,15 @@ describe.each([{ permission: 'Master' }, { permission: 'Private' }])(
170146

171147
test(`${permission} key: Get all indexes tasks with index instance`, async () => {
172148
const client = await getClient(permission)
173-
const enqueuedTask = await client
174-
.index(index.uid)
175-
.addDocuments([{ id: 1 }])
176-
await client.waitForTask(enqueuedTask.taskUid)
149+
await client.index(index.uid).addDocuments([{ id: 1 }])
150+
await client.index(index2.uid).addDocuments([{ id: 1 }])
177151

178152
const tasks = await client.index(index.uid).getTasks()
179-
180-
expect(tasks.results[0]).toHaveProperty(
181-
'status',
182-
TaskStatus.TASK_SUCCEEDED
183-
)
184-
expect(tasks.results[0].indexUid).toEqual(index.uid)
185-
expect(tasks.results[0].status).toEqual(TaskStatus.TASK_SUCCEEDED)
186-
expect(tasks.results[0].type).toEqual(
187-
TaskTypes.DOCUMENTS_ADDITION_OR_UPDATE
188-
)
189-
expect(tasks.results[0].enqueuedAt).toBeDefined()
190-
expect(tasks.results[0].uid).toBeDefined()
191-
expect(tasks.results[0].type).toEqual(
192-
TaskTypes.DOCUMENTS_ADDITION_OR_UPDATE
153+
const onlyTaskWithSameUid = new Set(
154+
tasks.results.map((task) => task.indexUid)
193155
)
194-
expect(tasks.results[0].duration).toBeDefined()
195-
expect(tasks.results[0].finishedAt).toBeDefined()
196-
expect(tasks.results[0].startedAt).toBeDefined()
156+
157+
expect(onlyTaskWithSameUid.size).toEqual(1)
197158
})
198159

199160
test(`${permission} key: Try to get a task that does not exist`, async () => {

0 commit comments

Comments
 (0)