test: Clean up tests

Reindexing test was generating index name, could just get it from server response. Also removed openAndClose from all integration tests
elastic · Mar 7, 2020 · 42dbd5a · 42dbd5a
1 parent 64b8e92
commit 42dbd5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.test.ts
@@ -163,7 +163,7 @@ describe('reindex API', () => {
         pathPattern: '/api/upgrade_assistant/reindex/{indexName}',
       })(
         routeHandlerContextMock,
-        createRequestMock({ params: { indexName: 'theIndex' }, body: { openAndClose: false } }),
+        createRequestMock({ params: { indexName: 'theIndex' } }),
         kibanaResponseFactory
       );
 
@@ -188,7 +188,7 @@ describe('reindex API', () => {
         pathPattern: '/api/upgrade_assistant/reindex/{indexName}',
       })(
         routeHandlerContextMock,
-        createRequestMock({ params: { indexName: 'theIndex' }, body: { openAndClose: false } }),
+        createRequestMock({ params: { indexName: 'theIndex' } }),
         kibanaResponseFactory
       );
 
@@ -211,7 +211,6 @@ describe('reindex API', () => {
             'kbn-auth-x': 'HERE!',
           },
           params: { indexName: 'theIndex' },
-          body: { openAndClose: false },
         }),
         kibanaResponseFactory
       );
@@ -234,7 +233,6 @@ describe('reindex API', () => {
         routeHandlerContextMock,
         createRequestMock({
           params: { indexName: 'theIndex' },
-          body: { openAndClose: false },
         }),
         kibanaResponseFactory
       );
@@ -261,7 +259,6 @@ describe('reindex API', () => {
         routeHandlerContextMock,
         createRequestMock({
           params: { indexName: 'theIndex' },
-          body: { openAndClose: false },
         }),
         kibanaResponseFactory
       );
@@ -387,7 +384,6 @@ describe('reindex API', () => {
         routeHandlerContextMock,
         createRequestMock({
           params: { indexName: 'cancelMe' },
-          body: { openAndClose: false },
         }),
         kibanaResponseFactory
       );

diff --git a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
@@ -55,9 +55,6 @@ export default function({ getService }) {
       const { body } = await supertest
         .post(`/api/upgrade_assistant/reindex/dummydata`)
         .set('kbn-xsrf', 'xxx')
-        .send({
-          openAndClose: false,
-        })
         .expect(200);
 
       expect(body.indexName).to.equal('dummydata');
@@ -106,9 +103,6 @@ export default function({ getService }) {
       await supertest
         .post(`/api/upgrade_assistant/reindex/dummydata`)
         .set('kbn-xsrf', 'xxx')
-        .send({
-          openAndClose: false,
-        })
         .expect(200);
       const lastState = await waitForReindexToComplete('dummydata');
 
@@ -133,9 +127,6 @@ export default function({ getService }) {
       const { body } = await supertest
         .post(`/api/upgrade_assistant/reindex/7.0-data`)
         .set('kbn-xsrf', 'xxx')
-        .send({
-          openAndClose: false,
-        })
         .expect(200);
 
       expect(body.indexName).to.equal('7.0-data');
@@ -199,6 +190,8 @@ export default function({ getService }) {
         expect(result.body.enqueued.length).to.equal(3);
         expect(result.body.errors.length).to.equal(0);
 
+        const [{ newIndexName: newTest1Name }] = result.body.enqueued;
+
         await assertQueueState(test1, 3);
         await waitForReindexToComplete(test1);
 
@@ -212,12 +205,12 @@ export default function({ getService }) {
 
         // Check that the closed index is still closed after reindexing
         const clusterStateResponse = await es.cluster.state({
-          index: generateNewIndexName(test1),
+          index: newTest1Name,
           metric: 'metadata',
         });
 
         const test1ReindexedState = getIndexStateFromClusterState(
-          generateNewIndexName(test1),
+          newTest1Name,
           clusterStateResponse
         );
         expect(test1ReindexedState).to.be('close');