chore(CI): test multiple type names

pelias · Nov 26, 2019 · a3f1106 · a3f1106
1 parent 0bda195
commit a3f1106
Show file tree

Hide file tree

Showing 15 changed files with 199 additions and 159 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,17 +3,18 @@ dist: bionic
 notifications:
   email: false
 node_js:
-  - 8
   - 10
   - 12
 matrix:
   fast_finish: true
 env:
   matrix:
-    - ES_VERSION=5.6.12 JDK_VERSION=oraclejdk8
-    - ES_VERSION=5.6.12 JDK_VERSION=oraclejdk11
-    - ES_VERSION=6.8.4 JDK_VERSION=oraclejdk8
-    - ES_VERSION=6.8.4 JDK_VERSION=oraclejdk11
+    - ES_VERSION=5.6.12 ES_TYPE=doc JDK_VERSION=oraclejdk8
+    - ES_VERSION=5.6.12 ES_TYPE=doc JDK_VERSION=oraclejdk11
+    - ES_VERSION=6.8.4 ES_TYPE=doc JDK_VERSION=oraclejdk8
+    - ES_VERSION=6.8.4 ES_TYPE=doc JDK_VERSION=oraclejdk11
+    - ES_VERSION=6.8.4 ES_TYPE=_doc JDK_VERSION=oraclejdk8
+    - ES_VERSION=6.8.4 ES_TYPE=_doc JDK_VERSION=oraclejdk11
 jdk:
   - oraclejdk8
   - oraclejdk11

diff --git a/integration/address_matching.js b/integration/address_matching.js
@@ -1,9 +1,8 @@
 // validate analyzer is behaving as expected
 
-var tape = require('tape'),
-    elastictest = require('elastictest'),
-    schema = require('../schema'),
-    punctuation = require('../punctuation');
+const elastictest = require('elastictest');
+const schema = require('../schema');
+const config = require('pelias-config').generate();
 
 module.exports.tests = {};
 
@@ -16,7 +15,8 @@ module.exports.tests.functional = function(test, common){
     // index some docs
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '1', body: { address_parts: {
           name: 'Mapzen HQ',
           number: 30,
@@ -28,7 +28,8 @@ module.exports.tests.functional = function(test, common){
 
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '2', body: { address_parts: {
           name: 'Fake Venue',
           number: 300,
@@ -40,7 +41,8 @@ module.exports.tests.functional = function(test, common){
 
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '3', body: { address_parts: {
           name: 'Mock British Address',
           number: 3000,
@@ -52,7 +54,8 @@ module.exports.tests.functional = function(test, common){
 
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '4', body: { address_parts: {
           name: 'Mystery Location',
           number: 300,
@@ -66,7 +69,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.number': 30 } }
         ]}}}
@@ -81,7 +84,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match_phrase: { 'address_parts.street': 'west 26th street' } }
         ]}}}
@@ -96,7 +99,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match_phrase: { 'address_parts.street': 'W 26th ST' } }
         ]}}}
@@ -111,7 +114,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '10010' } }
         ]}}}
@@ -126,7 +129,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'e24dn' } }
         ]}}}
@@ -141,7 +144,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '100-10' } }
         ]}}}
@@ -156,7 +159,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': '10 0 10' } }
         ]}}}
@@ -171,7 +174,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'E2-4DN' } }
         ]}}}
@@ -186,7 +189,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { bool: { must: [
           { match: { 'address_parts.zip': 'E2  4DN' } }
         ]}}}
@@ -220,7 +223,8 @@ module.exports.tests.venue_vs_address = function(test, common){
     // index a venue
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '1', body: {
           name: { default: 'Union Square' },
           phrase: { default: 'Union Square' }
@@ -234,7 +238,8 @@ module.exports.tests.venue_vs_address = function(test, common){
       return function( done ){
         let id = i + 100; // id offset
         suite.client.index({
-          index: suite.props.index, type: 'doc',
+          index: suite.props.index,
+          type: config.schema.typeName,
           id: String(id),
           body: {
             name: { default: `${id} Union Square` },
@@ -258,7 +263,7 @@ module.exports.tests.venue_vs_address = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         size: TOTAL_ADDRESS_DOCS+1,
         body: {

diff --git a/integration/admin_matching.js b/integration/admin_matching.js
@@ -1,9 +1,8 @@
 // validate analyzer is behaving as expected
 
-var tape = require('tape'),
-    elastictest = require('elastictest'),
-    schema = require('../schema'),
-    punctuation = require('../punctuation');
+const elastictest = require('elastictest');
+const schema = require('../schema');
+const config = require('pelias-config').generate();
 
 module.exports.tests = {};
 
@@ -16,7 +15,8 @@ module.exports.tests.functional = function(test, common){
     // index a document with all admin values
     suite.action( function( done ){
       suite.client.index({
-        index: suite.props.index, type: 'doc',
+        index: suite.props.index,
+        type: config.schema.typeName,
         id: '1', body: {
           parent: {
             country: 'Test Country',
@@ -46,7 +46,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { match: { 'parent.country': 'Test Country' } } }
       }, function( err, res ){
         t.equal( err, undefined );
@@ -59,7 +59,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { match: { 'parent.country_a': 'TestCountry' } } }
       }, function( err, res ){
         t.equal( err, undefined );
@@ -72,7 +72,7 @@ module.exports.tests.functional = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { match: { 'parent.country_id': '100' } } }
       }, function( err, res ){
         t.equal( err, undefined );

diff --git a/integration/analyzer_peliasPhrase.js b/integration/analyzer_peliasPhrase.js
@@ -1,9 +1,9 @@
 // validate analyzer is behaving as expected
 
-var tape = require('tape'),
-    elastictest = require('elastictest'),
-    schema = require('../schema'),
-    punctuation = require('../punctuation');
+const elastictest = require('elastictest');
+const schema = require('../schema');
+const punctuation = require('../punctuation');
+const config = require('pelias-config').generate();
 
 module.exports.tests = {};
 
@@ -154,7 +154,7 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         id: '1',
         body: { name: { default: 'Lake Cayuga' }, phrase: { default: 'Lake Cayuga' } }
       }, done );
@@ -164,7 +164,7 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         id: '2',
         body: { name: { default: 'Cayuga Lake' }, phrase: { default: 'Cayuga Lake' } }
       }, done );
@@ -174,7 +174,7 @@ module.exports.tests.slop_query = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         id: '3',
         body: { name: { default: '7991 Lake Cayuga Dr' }, phrase: { default: '7991 Lake Cayuga Dr' } }
       }, done );
@@ -211,7 +211,7 @@ module.exports.tests.slop_query = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: buildQuery('Lake Cayuga')
       }, function( err, res ){
@@ -249,7 +249,7 @@ module.exports.tests.slop = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         id: '1',
         body: { name: { default: '52 Görlitzer Straße' } }
       }, done);
@@ -262,7 +262,7 @@ module.exports.tests.slop = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         searchType: 'dfs_query_then_fetch',
         body: { query: { match_phrase: {
           'name.default': {

diff --git a/integration/analyzer_peliasQueryFullToken.js b/integration/analyzer_peliasQueryFullToken.js
@@ -1,9 +1,9 @@
 // validate analyzer is behaving as expected
 
-var tape = require('tape'),
-    elastictest = require('elastictest'),
-    schema = require('../schema'),
-    punctuation = require('../punctuation');
+const elastictest = require('elastictest');
+const schema = require('../schema');
+const punctuation = require('../punctuation');
+const config = require('pelias-config').generate();
 
 module.exports.tests = {};
 
@@ -151,7 +151,7 @@ module.exports.tests.slop = function(test, common){
     suite.action( function( done ){
       suite.client.index({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         id: '1',
         body: { name: { default: '52 Görlitzer Straße' } }
       }, done);
@@ -164,7 +164,7 @@ module.exports.tests.slop = function(test, common){
     suite.assert( function( done ){
       suite.client.search({
         index: suite.props.index,
-        type: 'doc',
+        type: config.schema.typeName,
         body: { query: { match_phrase: {
           'name.default': {
             'analyzer': 'peliasQueryFullToken',