From 317a854896c8124e6dea06345864a77a23beee36 Mon Sep 17 00:00:00 2001 From: Eli Perelman Date: Wed, 28 Aug 2019 16:13:38 -0500 Subject: [PATCH] Fix path to test fixtures --- x-pack/plugins/licensing/{ => server}/__fixtures__/setup.ts | 6 +++--- x-pack/plugins/licensing/server/license.test.ts | 2 +- x-pack/plugins/licensing/server/license_feature.test.ts | 2 +- x-pack/plugins/licensing/server/plugin.test.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename x-pack/plugins/licensing/{ => server}/__fixtures__/setup.ts (95%) diff --git a/x-pack/plugins/licensing/__fixtures__/setup.ts b/x-pack/plugins/licensing/server/__fixtures__/setup.ts similarity index 95% rename from x-pack/plugins/licensing/__fixtures__/setup.ts rename to x-pack/plugins/licensing/server/__fixtures__/setup.ts index e8d70490bb80b..a0cb1ea1a2b67 100644 --- a/x-pack/plugins/licensing/__fixtures__/setup.ts +++ b/x-pack/plugins/licensing/server/__fixtures__/setup.ts @@ -7,9 +7,9 @@ import { take, skip } from 'rxjs/operators'; import { merge } from 'lodash'; import { ClusterClient } from 'src/core/server'; -import { coreMock } from '../../../../src/core/server/mocks'; -import { Plugin } from './plugin'; -import { schema } from './schema'; +import { coreMock } from '../../../../../src/core/server/mocks'; +import { Plugin } from '../plugin'; +import { schema } from '../schema'; export async function licenseMerge(xpackInfo = {}) { return merge( diff --git a/x-pack/plugins/licensing/server/license.test.ts b/x-pack/plugins/licensing/server/license.test.ts index eda9070896616..1c308a6280449 100644 --- a/x-pack/plugins/licensing/server/license.test.ts +++ b/x-pack/plugins/licensing/server/license.test.ts @@ -8,7 +8,7 @@ import { ILicense } from './types'; import { Plugin } from './plugin'; import { LICENSE_STATUS } from './constants'; import { LicenseFeature } from './license_feature'; -import { setup } from '../__fixtures__/setup'; +import { setup } from './__fixtures__/setup'; describe('license', () => { let plugin: Plugin; diff --git a/x-pack/plugins/licensing/server/license_feature.test.ts b/x-pack/plugins/licensing/server/license_feature.test.ts index 2bfa75260886f..d36fa2cca48ba 100644 --- a/x-pack/plugins/licensing/server/license_feature.test.ts +++ b/x-pack/plugins/licensing/server/license_feature.test.ts @@ -6,7 +6,7 @@ import { ILicense } from './types'; import { Plugin } from './plugin'; -import { setup } from '../__fixtures__/setup'; +import { setup } from './__fixtures__/setup'; describe('licensing feature', () => { let plugin: Plugin; diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts index f668039be4ca7..e8d3b651620ba 100644 --- a/x-pack/plugins/licensing/server/plugin.test.ts +++ b/x-pack/plugins/licensing/server/plugin.test.ts @@ -8,7 +8,7 @@ import { take, skip } from 'rxjs/operators'; import { ILicense } from './types'; import { Plugin } from './plugin'; import { License } from './license'; -import { setup, setupOnly, licenseMerge } from '../__fixtures__/setup'; +import { setup, setupOnly, licenseMerge } from './__fixtures__/setup'; describe('licensing plugin', () => { let plugin: Plugin;