From 9ea8a0f9d1863e89d13ce7346152cc851ebe2490 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 8 Jan 2021 18:44:45 +0000 Subject: [PATCH] chore(NA): move grokdebugger plugin test fixtures out of __tests__ folder (#87765) (#87773) --- x-pack/plugins/grokdebugger/jest.config.js | 11 +++++++++++ ...equest.js => grokdebugger_request.test.js} | 19 +++++++++---------- ...ponse.js => grokdebugger_response.test.js} | 11 +++++------ 3 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 x-pack/plugins/grokdebugger/jest.config.js rename x-pack/plugins/grokdebugger/server/models/grokdebugger_request/{__tests__/grokdebugger_request.js => grokdebugger_request.test.js} (83%) rename x-pack/plugins/grokdebugger/server/models/grokdebugger_response/{__tests__/grokdebugger_response.js => grokdebugger_response.test.js} (85%) diff --git a/x-pack/plugins/grokdebugger/jest.config.js b/x-pack/plugins/grokdebugger/jest.config.js new file mode 100644 index 000000000000..bf43870b5ba6 --- /dev/null +++ b/x-pack/plugins/grokdebugger/jest.config.js @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +module.exports = { + preset: '@kbn/test', + rootDir: '../../..', + roots: ['/x-pack/plugins/grokdebugger'], +}; diff --git a/x-pack/plugins/grokdebugger/server/models/grokdebugger_request/__tests__/grokdebugger_request.js b/x-pack/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.test.js similarity index 83% rename from x-pack/plugins/grokdebugger/server/models/grokdebugger_request/__tests__/grokdebugger_request.js rename to x-pack/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.test.js index 2e0be6001f8c..0644a797da8b 100644 --- a/x-pack/plugins/grokdebugger/server/models/grokdebugger_request/__tests__/grokdebugger_request.js +++ b/x-pack/plugins/grokdebugger/server/models/grokdebugger_request/grokdebugger_request.test.js @@ -4,8 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import expect from '@kbn/expect'; -import { GrokdebuggerRequest } from '../grokdebugger_request'; +import { GrokdebuggerRequest } from './grokdebugger_request'; // FAILING: https://github.com/elastic/kibana/issues/51372 describe.skip('grokdebugger_request', () => { @@ -24,18 +23,18 @@ describe.skip('grokdebugger_request', () => { describe('fromDownstreamJSON factory method', () => { it('returns correct GrokdebuggerRequest instance from downstreamRequest', () => { const grokdebuggerRequest = GrokdebuggerRequest.fromDownstreamJSON(downstreamRequest); - expect(grokdebuggerRequest.rawEvent).to.eql(downstreamRequest.rawEvent); - expect(grokdebuggerRequest.pattern).to.eql(downstreamRequest.pattern); - expect(grokdebuggerRequest.customPatterns).to.eql({}); + expect(grokdebuggerRequest.rawEvent).toEqual(downstreamRequest.rawEvent); + expect(grokdebuggerRequest.pattern).toEqual(downstreamRequest.pattern); + expect(grokdebuggerRequest.customPatterns).toEqual({}); }); it('returns correct GrokdebuggerRequest instance from downstreamRequest when custom patterns are specified', () => { const grokdebuggerRequest = GrokdebuggerRequest.fromDownstreamJSON( downstreamRequestWithCustomPatterns ); - expect(grokdebuggerRequest.rawEvent).to.eql(downstreamRequest.rawEvent); - expect(grokdebuggerRequest.pattern).to.eql(downstreamRequest.pattern); - expect(grokdebuggerRequest.customPatterns).to.eql('%{FOO:bar}'); + expect(grokdebuggerRequest.rawEvent).toEqual(downstreamRequest.rawEvent); + expect(grokdebuggerRequest.pattern).toEqual(downstreamRequest.pattern); + expect(grokdebuggerRequest.customPatterns).toEqual('%{FOO:bar}'); }); }); @@ -67,7 +66,7 @@ describe.skip('grokdebugger_request', () => { }; const grokdebuggerRequest = GrokdebuggerRequest.fromDownstreamJSON(downstreamRequest); const upstreamJson = grokdebuggerRequest.upstreamJSON; - expect(upstreamJson).to.eql(expectedUpstreamJSON); + expect(upstreamJson).toEqual(expectedUpstreamJSON); }); it('returns the upstream simulate JSON request when custom patterns are specified', () => { @@ -99,7 +98,7 @@ describe.skip('grokdebugger_request', () => { downstreamRequestWithCustomPatterns ); const upstreamJson = grokdebuggerRequest.upstreamJSON; - expect(upstreamJson).to.eql(expectedUpstreamJSON); + expect(upstreamJson).toEqual(expectedUpstreamJSON); }); }); }); diff --git a/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js b/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.test.js similarity index 85% rename from x-pack/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js rename to x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.test.js index cc86e7653677..75b90d6758a8 100644 --- a/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/__tests__/grokdebugger_response.js +++ b/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.test.js @@ -4,8 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import expect from '@kbn/expect'; -import { GrokdebuggerResponse } from '../grokdebugger_response'; +import { GrokdebuggerResponse } from './grokdebugger_response'; describe('grokdebugger_response', () => { describe('GrokdebuggerResponse', () => { @@ -38,8 +37,8 @@ describe('grokdebugger_response', () => { client: '55.3.244.1', }; const grokdebuggerResponse = GrokdebuggerResponse.fromUpstreamJSON(upstreamJson); - expect(grokdebuggerResponse.structuredEvent).to.eql(expectedStructuredEvent); - expect(grokdebuggerResponse.error).to.eql({}); + expect(grokdebuggerResponse.structuredEvent).toEqual(expectedStructuredEvent); + expect(grokdebuggerResponse.error).toEqual({}); }); it('returns correct GrokdebuggerResponse instance when there are valid grok parse errors', () => { @@ -62,8 +61,8 @@ describe('grokdebugger_response', () => { ], }; const grokdebuggerResponse = GrokdebuggerResponse.fromUpstreamJSON(upstreamJson); - expect(grokdebuggerResponse.structuredEvent).to.eql({}); - expect(grokdebuggerResponse.error).to.be( + expect(grokdebuggerResponse.structuredEvent).toEqual({}); + expect(grokdebuggerResponse.error).toBe( 'Provided Grok patterns do not match data in the input' ); });