Skip to content

Commit

Permalink
Merge pull request #8 from joelgriffith/reporting/register-routes-syn…
Browse files Browse the repository at this point in the history
…chro

Reporting/register routes synchro
  • Loading branch information
tsullivan authored Jun 15, 2020
2 parents a8ff18c + a7bae68 commit 130bc7b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion x-pack/plugins/reporting/server/routes/generation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { of } from 'rxjs';
type setupServerReturn = UnwrapPromise<ReturnType<typeof setupServer>>;

describe('POST /api/reporting/generate', () => {
const reportingSymbol = Symbol('reporting');
let server: setupServerReturn['server'];
let httpSetup: setupServerReturn['httpSetup'];
let exportTypesRegistry: ExportTypesRegistry;
Expand Down Expand Up @@ -47,7 +48,8 @@ describe('POST /api/reporting/generate', () => {
} as unknown) as jest.Mocked<LevelLogger>;

beforeEach(async () => {
({ server, httpSetup } = await setupServer());
({ server, httpSetup } = await setupServer(reportingSymbol));
httpSetup.registerRouteHandlerContext(reportingSymbol, 'reporting', () => ({}));
const mockDeps = ({
elasticsearch: {
legacy: {
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/reporting/server/routes/jobs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { registerJobInfoRoutes } from './jobs';
type setupServerReturn = UnwrapPromise<ReturnType<typeof setupServer>>;

describe('GET /api/reporting/jobs/download', () => {
const reportingSymbol = Symbol('reporting');
let server: setupServerReturn['server'];
let httpSetup: setupServerReturn['httpSetup'];
let exportTypesRegistry: ExportTypesRegistry;
Expand All @@ -39,7 +40,8 @@ describe('GET /api/reporting/jobs/download', () => {
};

beforeEach(async () => {
({ server, httpSetup } = await setupServer());
({ server, httpSetup } = await setupServer(reportingSymbol));
httpSetup.registerRouteHandlerContext(reportingSymbol, 'reporting', () => ({}));
core = await createMockReportingCore(config, ({
elasticsearch: {
legacy: { client: { callAsInternalUser: jest.fn() } },
Expand Down

0 comments on commit 130bc7b

Please sign in to comment.