Use dedicated index for drawing functional tests. Modifying existing …

…test index data effects other unrelated tests
elastic · Jun 24, 2021 · 8ecec69 · 8ecec69
1 parent 0dd4265
commit 8ecec69
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 12 deletions.
diff --git a/x-pack/test/api_integration/apis/maps/delete_feature.js b/x-pack/test/api_integration/apis/maps/delete_feature.js
@@ -14,7 +14,7 @@ export default function ({ getService }) {
  .delete(`/api/maps/feature/999`)
  .set('kbn-xsrf', 'kibana')
  .send({
- index: 'geo_shapes',
+ index: 'drawing_data',
  })
  .expect(200);
  });
@@ -24,7 +24,7 @@ export default function ({ getService }) {
  .delete(`/api/maps/feature/999`)
  .set('kbn-xsrf', 'kibana')
  .send({
- index: 'geo_shapes',
+ index: 'drawing_data',
  })
  .expect(404);
  });
@@ -34,7 +34,7 @@ export default function ({ getService }) {
  .delete(`/api/maps/feature/998`)
  .set('kbn-xsrf', 'kibana')
  .send({
- index: 'geo_shapes',
+ index: 'drawing_data',
  })
  .expect(404);
  });

diff --git a/x-pack/test/functional/apps/maps/joins.js b/x-pack/test/functional/apps/maps/joins.js
@@ -13,7 +13,6 @@ const EXPECTED_JOIN_VALUES = {
  bravo: 3,
  charlie: 12,
  tango: undefined,
- zulu: undefined,
 };
 
 const VECTOR_SOURCE_ID = 'n1t6f';
@@ -77,10 +76,10 @@ export default function ({ getPageObjects, getService }) {
 
  it('should decorate feature properties with join property', async () => {
  const mapboxStyle = await PageObjects.maps.getMapboxStyle();
- expect(mapboxStyle.sources[VECTOR_SOURCE_ID].data.features.length).to.equal(10);
+ expect(mapboxStyle.sources[VECTOR_SOURCE_ID].data.features.length).to.equal(8);
 
  mapboxStyle.sources.n1t6f.data.features.forEach(({ properties }) => {
- if (properties.name === 'tango' || properties.name === 'zulu') {
+ if (properties.name === 'tango') {
  //left join, which means we won't rescale joins that do not match
  expect(properties.hasOwnProperty(JOIN_PROPERTY_NAME)).to.be(false);
  } else {
@@ -99,14 +98,12 @@ export default function ({ getPageObjects, getService }) {
  });
 
  expect(visibilitiesOfFeatures).to.eql([
- false,
  false,
  true,
  true,
  true,
  // geo centroids for above features
  false,
- false,
  true,
  true,
  true,
@@ -167,14 +164,12 @@ export default function ({ getPageObjects, getService }) {
  });
 
  expect(visibilitiesOfFeatures).to.eql([
- false,
  false,
  true,
  false,
  false,
  // geo centroids for above features
  false,
- false,
  true,
  false,
  false,

diff --git a/x-pack/test/functional/es_archives/maps/data/data.json b/x-pack/test/functional/es_archives/maps/data/data.json
@@ -136,11 +136,12 @@
  }
 }
 
+
 {
  "type": "doc",
  "value": {
  "id": "999",
- "index": "geo_shapes",
+ "index": "drawing_data",
  "source": {
  "geometry": {
  "coordinates": [
@@ -165,7 +166,7 @@
  ],
  "type": "polygon"
  },
- "name": "zulu",
+ "name": "doc-to-delete",
  "prop1": 9
  }
  }

diff --git a/x-pack/test/functional/es_archives/maps/data/mappings.json b/x-pack/test/functional/es_archives/maps/data/mappings.json
@@ -26,6 +26,34 @@
  }
 }
 
+{
+ "type": "index",
+ "value": {
+ "index": "drawing_data",
+ "mappings": {
+ "properties": {
+ "geometry": {
+ "type": "geo_shape"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "prop1": {
+ "type": "byte"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_replicas": "0",
+ "number_of_shards": "1",
+ "max_result_window": "10001",
+ "max_inner_result_window": "101"
+ }
+ }
+ }
+}
+
 {
  "type": "index",
  "value": {