From 3b4922aadf7c2c9837de1630ab6f5be2382b6842 Mon Sep 17 00:00:00 2001 From: Rudolf Meijering Date: Mon, 12 Apr 2021 23:25:46 +0200 Subject: [PATCH] Correctly fix merge conflicts --- .../integration_tests/actions.test.ts | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts index e8e6407b89a5e..f90c18d3bf4d3 100644 --- a/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts +++ b/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts @@ -388,11 +388,11 @@ describe('migration actions', () => { } `); - const results = ((await searchForOutdatedDocuments(client, { - batchSize: 1000, - targetIndex: 'reindex_target_excluded_docs', - outdatedDocumentsQuery: undefined, - })()) as Either.Right).right.outdatedDocuments; + const results = ((await searchForOutdatedDocuments( + client, + 'reindex_target_excluded_docs', + undefined as any + )()) as Either.Right).right.outdatedDocuments; expect(results.map((doc) => doc._source.title)).toMatchInlineSnapshot(` Array [ "doc 1", @@ -757,10 +757,11 @@ describe('migration actions', () => { )()) as Either.Right).right.outdatedDocuments; expect(resultsWithQuery.length).toBe(3); - const resultsWithoutQuery = ((await searchForOutdatedDocuments(client, { - targetIndex: 'existing_index_with_docs', - outdatedDocumentsQuery: undefined, - })()) as Either.Right).right.outdatedDocuments; + const resultsWithoutQuery = ((await searchForOutdatedDocuments( + client, + 'existing_index_with_docs', + undefined as any + )()) as Either.Right).right.outdatedDocuments; expect(resultsWithoutQuery.length).toBe(5); }); it('resolves with _id, _source, _seq_no and _primary_term', async () => {