Use __mocks__ new_platform

rudolf · Jun 25, 2019 · 2d666fa · 2d666fa
1 parent 4f5331c
commit 2d666fa
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 50 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -140,13 +140,11 @@ module.exports = {
                   'src/core/public/**/*',
                   '!src/core/public/index.ts',
                   '!src/core/public/mocks.ts',
-                  '!src/core/public/*.test.mocks.ts',
                   '!src/core/public/utils/**/*',
 
                   'src/core/server/**/*',
                   '!src/core/server/index.ts',
                   '!src/core/server/mocks.ts',
-                  '!src/core/server/*.test.mocks.ts',
 
                   'src/plugins/**/public/**/*',
                   '!src/plugins/**/public/index*',

diff --git a/src/core/public/ui_new_platform.test.mocks.ts b/src/core/public/ui_new_platform.test.mocks.ts
diff --git a/src/dev/jest/setup/mocks.js b/src/dev/jest/setup/mocks.js
@@ -35,6 +35,7 @@
  */
 
 jest.mock('ui/metadata');
+jest.mock('ui/new_platform');
 jest.mock('ui/documentation_links/documentation_links');
 jest.mock('ui/chrome');
 

diff --git a/src/legacy/core_plugins/embeddable_api/public/actions/action.test.ts b/src/legacy/core_plugins/embeddable_api/public/actions/action.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import { HelloWorldAction, SayHelloAction, EmptyEmbeddable } from '../test_samples/index';
 

diff --git a/src/legacy/core_plugins/embeddable_api/public/actions/apply_filter_action.test.ts b/src/legacy/core_plugins/embeddable_api/public/actions/apply_filter_action.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 import {
   FilterableEmbeddable,
   FilterableEmbeddableFactory,

diff --git a/src/legacy/core_plugins/embeddable_api/public/containers/container.test.ts b/src/legacy/core_plugins/embeddable_api/public/containers/container.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import * as Rx from 'rxjs';
 import { skip } from 'rxjs/operators';

diff --git a/src/legacy/core_plugins/embeddable_api/public/containers/embeddable_child_panel.test.tsx b/src/legacy/core_plugins/embeddable_api/public/containers/embeddable_child_panel.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableInput,

diff --git a/src/legacy/core_plugins/embeddable_api/public/embeddables/embeddable.test.tsx b/src/legacy/core_plugins/embeddable_api/public/embeddables/embeddable.test.tsx
@@ -20,7 +20,7 @@
 /* eslint-disable max-classes-per-file */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import { skip } from 'rxjs/operators';
 import { ContactCardEmbeddable, FilterableEmbeddable } from '../test_samples/index';

diff --git a/src/legacy/core_plugins/embeddable_api/public/get_actions_for_trigger.test.ts b/src/legacy/core_plugins/embeddable_api/public/get_actions_for_trigger.test.ts
@@ -18,6 +18,7 @@
  */
 
 import './ui_capabilities.test.mocks';
+jest.mock('ui/new_platform');
 
 import {
   HelloWorldAction,

diff --git a/src/legacy/core_plugins/embeddable_api/public/panel/embeddable_panel.test.tsx b/src/legacy/core_plugins/embeddable_api/public/panel/embeddable_panel.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import React from 'react';
 

diff --git a/...mbeddable_api/public/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx b/...mbeddable_api/public/panel/panel_header/panel_actions/add_panel/add_panel_action.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../../../../ui_capabilities.test.mocks';
-import '../../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import {
   FilterableContainer,

diff --git a/...mbeddable_api/public/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/...mbeddable_api/public/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import '../../../../ui_capabilities.test.mocks';
-import { coreStartMock } from '../../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import React from 'react';
 import {
@@ -36,6 +36,8 @@ import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { skip } from 'rxjs/operators';
 import * as Rx from 'rxjs';
 import { EmbeddableFactory } from '../../../../embeddables';
+import { OverlayStart } from 'src/core/public';
+import { npStart } from 'ui/new_platform';
 
 const onClose = jest.fn();
 let container: Container;
@@ -79,7 +81,8 @@ test('create new calls factory.adds a panel to the container', async done => {
 
   await nextTick();
 
-  const overlayMock = coreStartMock.overlays;
+  const overlayMock = npStart.core.overlays as jest.Mocked<PublicMethodsOf<OverlayStart>>;
+
   ((overlayMock.openModal.mock.calls[0][0] as any).props as ContactCardInitializerProps).onCreate({
     firstName: 'Dany',
     lastName: 'Targaryan',

diff --git a/...pi/public/panel/panel_header/panel_actions/customize_title/customize_panel_action.test.ts b/...pi/public/panel/panel_header/panel_actions/customize_title/customize_panel_action.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../../../../ui_capabilities.test.mocks';
-import '../../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import {
   CONTACT_CARD_EMBEDDABLE,

diff --git a/...pi/public/panel/panel_header/panel_actions/customize_title/customize_panel_modal.test.tsx b/...pi/public/panel/panel_header/panel_actions/customize_title/customize_panel_modal.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../../../../ui_capabilities.test.mocks';
-import '../../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import React from 'react';
 import {

diff --git a/...plugins/embeddable_api/public/panel/panel_header/panel_actions/edit_panel_action.test.tsx b/...plugins/embeddable_api/public/panel/panel_header/panel_actions/edit_panel_action.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../../../ui_capabilities.test.mocks';
-import '../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import { EmbeddableInput } from '../../../embeddables/i_embeddable';
 import { Embeddable } from '../../../embeddables/embeddable';

diff --git a/...gins/embeddable_api/public/panel/panel_header/panel_actions/inspect_panel_action.test.tsx b/...gins/embeddable_api/public/panel/panel_header/panel_actions/inspect_panel_action.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../../../ui_capabilities.test.mocks';
-import '../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 jest.mock('ui/inspector', () => ({
   Inspector: {

diff --git a/...ugins/embeddable_api/public/panel/panel_header/panel_actions/remove_panel_action.test.tsx b/...ugins/embeddable_api/public/panel/panel_header/panel_actions/remove_panel_action.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import '../../../ui_capabilities.test.mocks';
-import '../../../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import {
   FilterableContainer,

diff --git a/src/legacy/core_plugins/embeddable_api/public/triggers/execute_trigger_actions.test.ts b/src/legacy/core_plugins/embeddable_api/public/triggers/execute_trigger_actions.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import { EuiContextMenuPanelDescriptor } from '@elastic/eui';
 

diff --git a/src/legacy/core_plugins/embeddable_api/public/triggers/trigger_registry.test.ts b/src/legacy/core_plugins/embeddable_api/public/triggers/trigger_registry.test.ts
@@ -18,7 +18,7 @@
  */
 
 import '../ui_capabilities.test.mocks';
-import '../../../../../core/public/ui_new_platform.test.mocks';
+jest.mock('ui/new_platform');
 
 import { triggerRegistry } from '../triggers';
 import { HELLO_WORLD_ACTION_ID } from '../test_samples';

diff --git a/src/legacy/ui/public/new_platform/index.ts → ...egacy/ui/public/__mocks__/new_platform.ts b/src/legacy/ui/public/new_platform/index.ts → ...egacy/ui/public/__mocks__/new_platform.ts
@@ -16,4 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export { __setup__, __start__, npSetup, npStart } from './new_platform';
+
+import { coreMock } from '../../../../core/public/mocks';
+
+export const npStart = { core: coreMock.createStart() };
+export const npSetup = { core: coreMock.createSetup() };
diff --git a/...cy/ui/public/new_platform/new_platform.ts → src/legacy/ui/public/new_platform.ts b/...cy/ui/public/new_platform/new_platform.ts → src/legacy/ui/public/new_platform.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { InternalCoreSetup, InternalCoreStart } from '../../../../core/public';
+import { InternalCoreSetup, InternalCoreStart } from '../../../core/public';
 
 export const npSetup = {
   core: (null as unknown) as InternalCoreSetup,