[7.11] chore(NA): move maps plugin test fixtures out of __tests__ fol…

…der (#87764) (#87880) * chore(NA): move maps plugin test fixtures out of __tests__ folder (#87764) * chore(NA): move maps plugin test fixtures out of __tests__ folder * chore(NA): last missing __tests__ folders renamed Co-authored-by: Kibana Machine <[email protected]> # Conflicts: # x-pack/plugins/maps/server/mvt/__fixtures__/pbf/0_0_0_docs.pbf # x-pack/plugins/maps/server/mvt/__fixtures__/pbf/0_0_0_grid_asgrid.pbf # x-pack/plugins/maps/server/mvt/__fixtures__/pbf/0_0_0_grid_aspoint.pbf * test(NA): fix failing test
elastic · Jan 12, 2021 · 93e2d82 · 93e2d82
1 parent 60c0bac
commit 93e2d82
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 9 deletions.
diff --git a/...ses/layers/__tests__/mock_sync_context.ts → .../layers/__fixtures__/mock_sync_context.ts b/...ses/layers/__tests__/mock_sync_context.ts → .../layers/__fixtures__/mock_sync_context.ts
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { MockSyncContext } from '../__tests__/mock_sync_context';
+import { MockSyncContext } from '../__fixtures__/mock_sync_context';
 import sinon from 'sinon';
 
 jest.mock('../../../kibana_services', () => {

diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -21,7 +21,7 @@ import {
   DATA_MAPPING_FUNCTION,
   VECTOR_STYLES,
 } from '../../../../../common/constants';
-import { mockField, MockLayer, MockStyle } from './__tests__/test_util';
+import { mockField, MockLayer, MockStyle } from './test_helpers/test_util';
 import { ColorDynamicOptions } from '../../../../../common/descriptor_types';
 import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';
 import { IField } from '../../../fields/field';

diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx
@@ -16,7 +16,7 @@ import React from 'react';
 import { RawValue, VECTOR_STYLES } from '../../../../../common/constants';
 // @ts-ignore
 import { DynamicIconProperty } from './dynamic_icon_property';
-import { mockField, MockLayer } from './__tests__/test_util';
+import { mockField, MockLayer } from './test_helpers/test_util';
 import { IconDynamicOptions } from '../../../../../common/descriptor_types';
 import { IField } from '../../../fields/field';
 import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';

diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
@@ -19,7 +19,7 @@ import { RawValue, VECTOR_STYLES } from '../../../../../common/constants';
 import { IField } from '../../../fields/field';
 import { Map as MbMap } from 'mapbox-gl';
 import { SizeDynamicOptions } from '../../../../../common/descriptor_types';
-import { mockField, MockLayer, MockStyle } from './__tests__/test_util';
+import { mockField, MockLayer, MockStyle } from './test_helpers/test_util';
 import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';
 
 export class MockMbMap {

diff --git a/.../vector/properties/__tests__/test_util.ts → ...ctor/properties/test_helpers/test_util.ts b/.../vector/properties/__tests__/test_util.ts → ...ctor/properties/test_helpers/test_util.ts
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
@@ -12,7 +12,7 @@ import {
   VECTOR_SHAPE_TYPE,
   VECTOR_STYLES,
 } from '../../../../common/constants';
-import { MockField } from './properties/__tests__/test_util';
+import { MockField } from './properties/test_helpers/test_util';
 
 jest.mock('../../../kibana_services');
 

diff --git a/...ver/mvt/__tests__/json/0_0_0_gridagg.json → .../mvt/__fixtures__/json/0_0_0_gridagg.json b/...ver/mvt/__tests__/json/0_0_0_gridagg.json → .../mvt/__fixtures__/json/0_0_0_gridagg.json
diff --git a/...rver/mvt/__tests__/json/0_0_0_search.json → ...r/mvt/__fixtures__/json/0_0_0_search.json b/...rver/mvt/__tests__/json/0_0_0_search.json → ...r/mvt/__fixtures__/json/0_0_0_search.json
diff --git a/...s/server/mvt/__tests__/pbf/0_0_0_docs.pbf → ...erver/mvt/__fixtures__/pbf/0_0_0_docs.pbf b/...s/server/mvt/__tests__/pbf/0_0_0_docs.pbf → ...erver/mvt/__fixtures__/pbf/0_0_0_docs.pbf
diff --git a/...r/mvt/__tests__/pbf/0_0_0_grid_asgrid.pbf → ...vt/__fixtures__/pbf/0_0_0_grid_asgrid.pbf b/...r/mvt/__tests__/pbf/0_0_0_grid_asgrid.pbf → ...vt/__fixtures__/pbf/0_0_0_grid_asgrid.pbf
diff --git a/.../mvt/__tests__/pbf/0_0_0_grid_aspoint.pbf → ...t/__fixtures__/pbf/0_0_0_grid_aspoint.pbf b/.../mvt/__tests__/pbf/0_0_0_grid_aspoint.pbf → ...t/__fixtures__/pbf/0_0_0_grid_aspoint.pbf
diff --git a/...server/mvt/__tests__/tile_es_responses.ts → ...ver/mvt/__fixtures__/tile_es_responses.ts b/...server/mvt/__tests__/tile_es_responses.ts → ...ver/mvt/__fixtures__/tile_es_responses.ts
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.test.ts b/x-pack/plugins/maps/server/mvt/get_tile.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { getGridTile, getTile } from './get_tile';
-import { TILE_GRIDAGGS, TILE_SEARCHES } from './__tests__/tile_es_responses';
+import { TILE_GRIDAGGS, TILE_SEARCHES } from './__fixtures__/tile_es_responses';
 import { Logger } from 'src/core/server';
 import * as path from 'path';
 import * as fs from 'fs';
@@ -53,7 +53,7 @@ describe('getTile', () => {
       geoFieldType: ES_GEO_FIELD_TYPE.GEO_SHAPE,
     });
 
-    compareTiles('./__tests__/pbf/0_0_0_docs.pbf', tile);
+    compareTiles('./__fixtures__/pbf/0_0_0_docs.pbf', tile);
   });
 });
 
@@ -116,12 +116,12 @@ describe('getGridTile', () => {
 
   test('0.0.0 tile (clusters)', async () => {
     const tile = await getGridTile(defaultParams);
-    compareTiles('./__tests__/pbf/0_0_0_grid_aspoint.pbf', tile);
+    compareTiles('./__fixtures__/pbf/0_0_0_grid_aspoint.pbf', tile);
   });
 
   test('0.0.0 tile (grids)', async () => {
     const tile = await getGridTile({ ...defaultParams, requestType: RENDER_AS.GRID });
-    compareTiles('./__tests__/pbf/0_0_0_grid_asgrid.pbf', tile);
+    compareTiles('./__fixtures__/pbf/0_0_0_grid_asgrid.pbf', tile);
   });
 });