Skip to content

Commit 774b53f

Browse files
StriftStrift
committed
Use new waitTask() function
1 parent 7ee3be5 commit 774b53f

16 files changed

+57
-67
lines changed

‎packages/autocomplete-client/src/search/__tests__/fetchMeilisearchResults.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ const SECOND_ITEM_ID = MOVIES[1].id
1414

1515
beforeAll(async () => {
1616
await meilisearchClient.deleteIndex(INDEX_NAME)
17-
const task = await meilisearchClient.index(INDEX_NAME).addDocuments(MOVIES)
18-
await meilisearchClient.waitForTask(task.taskUid)
17+
await meilisearchClient.index(INDEX_NAME).addDocuments(MOVIES).waitTask()
1918
})
2019

2120
afterAll(async () => {

‎packages/instant-meilisearch/__tests__/configure.attributes-to-retrieve.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ import {
88

99
describe('Instant Meilisearch Browser test', () => {
1010
beforeAll(async () => {
11-
const deleteTask = await meilisearchClient.deleteIndex('movies')
12-
await meilisearchClient.waitForTask(deleteTask.taskUid)
11+
await meilisearchClient.deleteIndex('movies').waitTask()
1312

14-
const documentsTask = await meilisearchClient
13+
await meilisearchClient
1514
.index('movies')
1615
.addDocuments(dataset)
17-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
16+
.waitTask()
1817
})
1918

2019
test('attributesToRetrieve on no attributes', async () => {

‎packages/instant-meilisearch/__tests__/custom-http-client.test.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ import { meilisearchClient, dataset } from './assets/utils.js'
44

55
describe('Custom HTTP client tests', () => {
66
beforeAll(async () => {
7-
const deleteTask = await meilisearchClient.deleteIndex('movies')
8-
await meilisearchClient.waitForTask(deleteTask.taskUid)
7+
await meilisearchClient.deleteIndex('movies').waitTask()
98

10-
const documentsTask = await meilisearchClient
9+
await meilisearchClient
1110
.index('movies')
1211
.addDocuments(dataset)
13-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
12+
.waitTask()
1413
})
1514

1615
test('a custom HTTP client', async () => {
17-
const httpClient = vi.fn(async (url: string, init?: RequestInit) => {
16+
const httpClient = vi.fn(async (url: RequestInfo | URL, init?: RequestInit) => {
1817
const result = await fetch(url, init)
1918
return await result.json()
2019
})

‎packages/instant-meilisearch/__tests__/disjunctive-facet-search.test.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ describe('Keep zero facets tests', () => {
2222
})
2323

2424
await moviesIndex.addDocuments(movies)
25-
const response = await gamesIndex.addDocuments(games)
26-
27-
await meilisearchClient.waitForTask(response.taskUid)
25+
await gamesIndex.addDocuments(games).waitTask()
2826
})
2927

3028
test('searching on one index with facet filtering', async () => {

‎packages/instant-meilisearch/__tests__/facet-stats.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { searchClient, dataset, meilisearchClient } from './assets/utils.js'
33

44
describe('Facet stats tests', () => {
55
beforeAll(async () => {
6-
const deleteTask = await meilisearchClient.deleteIndex('movies')
7-
await meilisearchClient.waitForTask(deleteTask.taskUid)
6+
await meilisearchClient.deleteIndex('movies').waitTask()
87
await meilisearchClient
98
.index('movies')
109
.updateFilterableAttributes(['genres', 'release_date', 'id'])
11-
const documentsTask = await meilisearchClient
10+
.waitTask()
11+
await meilisearchClient
1212
.index('movies')
1313
.addDocuments(dataset)
14-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
14+
.waitTask()
1515
})
1616

1717
test('Facet stats on an empty facets array', async () => {

‎packages/instant-meilisearch/__tests__/facets-distribution.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { searchClient, dataset, meilisearchClient } from './assets/utils.js'
33

44
describe('Instant Meilisearch Browser test', () => {
55
beforeAll(async () => {
6-
const deleteTask = await meilisearchClient.deleteIndex('movies')
7-
await meilisearchClient.waitForTask(deleteTask.taskUid)
6+
await meilisearchClient.deleteIndex('movies').waitTask()
87
await meilisearchClient
98
.index('movies')
109
.updateFilterableAttributes(['genres'])
11-
const documentsTask = await meilisearchClient
10+
.waitTask()
11+
await meilisearchClient
1212
.index('movies')
1313
.addDocuments(dataset)
14-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
14+
.waitTask()
1515
})
1616

1717
test('empty array on facetDistribution', async () => {

‎packages/instant-meilisearch/__tests__/filter.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import {
88

99
describe('Instant Meilisearch Browser test', () => {
1010
beforeAll(async () => {
11-
const deleteTask = await meilisearchClient.deleteIndex('movies')
12-
await meilisearchClient.waitForTask(deleteTask.taskUid)
11+
await meilisearchClient.deleteIndex('movies').waitTask()
1312
await meilisearchClient
1413
.index('movies')
1514
.updateFilterableAttributes([
@@ -18,10 +17,11 @@ describe('Instant Meilisearch Browser test', () => {
1817
'numberField',
1918
'crazy_\\_"field"',
2019
])
21-
const documentsTask = await meilisearchClient
20+
.waitTask()
21+
await meilisearchClient
2222
.index('movies')
2323
.addDocuments(dataset)
24-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
24+
.waitTask()
2525
})
2626

2727
test('one string facet on filter without a query', async () => {

‎packages/instant-meilisearch/__tests__/first-facets-distribution.test.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ import { instantMeiliSearch } from '../src/index.js'
44

55
describe('Default facet distribution', () => {
66
beforeAll(async () => {
7-
const deleteTask = await meilisearchClient.deleteIndex('movies')
8-
await meilisearchClient.waitForTask(deleteTask.taskUid)
7+
await meilisearchClient.deleteIndex('movies').waitTask()
98
await meilisearchClient.index('movies').updateSettings({
109
filterableAttributes: ['genres', 'release_date'],
1110
sortableAttributes: ['release_date'],
12-
})
13-
const documentsTask = await meilisearchClient
11+
}).waitTask()
12+
await meilisearchClient
1413
.index('movies')
1514
.addDocuments(dataset)
16-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
15+
.waitTask()
1716
})
1817

1918
// Without facets

‎packages/instant-meilisearch/__tests__/geosearch.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import {
88

99
describe('Instant Meilisearch Browser test', () => {
1010
beforeAll(async () => {
11-
const deleteTask = await meilisearchClient.deleteIndex('geotest')
12-
await meilisearchClient.waitForTask(deleteTask.taskUid)
11+
await meilisearchClient.deleteIndex('geotest').waitTask()
1312
await meilisearchClient
1413
.index('geotest')
1514
.updateFilterableAttributes(['_geo'])
16-
await meilisearchClient.index('geotest').updateSortableAttributes(['_geo'])
17-
const documentsTask = await meilisearchClient
15+
.waitTask()
16+
await meilisearchClient.index('geotest').updateSortableAttributes(['_geo']).waitTask()
17+
await meilisearchClient
1818
.index('geotest')
1919
.addDocuments(geoDataset)
20-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
20+
.waitTask()
2121
})
2222

2323
test('aroundRadius and aroundLatLng in geo search', async () => {

‎packages/instant-meilisearch/__tests__/highlight.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import {
88

99
describe('Highlight Browser test', () => {
1010
beforeAll(async () => {
11-
const deleteTask = await meilisearchClient.deleteIndex('movies')
12-
await meilisearchClient.waitForTask(deleteTask.taskUid)
11+
await meilisearchClient.deleteIndex('movies').waitTask()
1312
await meilisearchClient
1413
.index('movies')
1514
.updateFilterableAttributes(['genres'])
16-
const documentsTask = await meilisearchClient
15+
.waitTask()
16+
await meilisearchClient
1717
.index('movies')
1818
.addDocuments(dataset)
19-
await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
19+
.waitTask()
2020
})
2121

2222
test('one attributesToHighlight on wrong attribute placeholder', async () => {

0 commit comments

Comments
 (0)