Use bool instead of filtered queries in fixtures

This is needed for Elasticsearch 5 support as part of https://github.com/pelias/pelias/issues/461
8 years ago · 81b52fafaf
23 changed files with 1832 additions and 1943 deletions
--- a/test/unit/fixture/search_boundary_country.js
+++ b/test/unit/fixture/search_boundary_country.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_fallback.js
+++ b/test/unit/fixture/search_fallback.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -828,13 +826,6 @@ module.exports = {
          ]
        }
      },
-          'filter': {
-            'bool': {
-              'must': []
-            }
-          }
-        }
-      },
      'max_boost': 20,
      'functions': [
        {
--- a/test/unit/fixture/search_fallback_postalcode_only.js
+++ b/test/unit/fixture/search_fallback_postalcode_only.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -30,13 +28,6 @@ module.exports = {
          ]
        }
      },
-          'filter': {
-            'bool': {
-              'must': []
-            }
-          }
-        }
-      },
      'max_boost': 20,
      'functions': [
        {
--- a/test/unit/fixture/search_linguistic_bbox.js
+++ b/test/unit/fixture/search_linguistic_bbox.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_focus.js
+++ b/test/unit/fixture/search_linguistic_focus.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_focus_bbox.js
+++ b/test/unit/fixture/search_linguistic_focus_bbox.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_focus_null_island.js
+++ b/test/unit/fixture/search_linguistic_focus_null_island.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_only.js
+++ b/test/unit/fixture/search_linguistic_only.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_viewport.js
+++ b/test/unit/fixture/search_linguistic_viewport.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
+++ b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_with_category_filtering.js
+++ b/test/unit/fixture/search_with_category_filtering.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/search_with_source_filtering.js
+++ b/test/unit/fixture/search_with_source_filtering.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -25,9 +23,7 @@ module.exports = {
                }
              }
            }
-              ]
-            }
-          },
+          ],
          'filter': {
            'bool': {
              'must': [
--- a/test/unit/fixture/structured_geocoding/boundary_country.json
+++ b/test/unit/fixture/structured_geocoding/boundary_country.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/fallback.json
+++ b/test/unit/fixture/structured_geocoding/fallback.json
@ -1,8 +1,6 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
          "should": [
@ -829,13 +827,6 @@
          ]
        }
      },
-          "filter": {
-            "bool": {
-              "must": []
-            }
-          }
-        }
-      },
      "max_boost": 20,
      "functions": [
        {
--- a/test/unit/fixture/structured_geocoding/linguistic_bbox.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_bbox.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_focus.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_only.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_only.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_viewport.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_viewport.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
@ -1,13 +1,9 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [],
          "filter": {
            "bool": {
              "must": [
--- a/test/unit/fixture/structured_geocoding/postalcode_only.js
+++ b/test/unit/fixture/structured_geocoding/postalcode_only.js
@ -1,8 +1,6 @@
 module.exports = {
  'query': {
    'function_score': {
-      'query': {
-        'filtered': {
      'query': {
        'bool': {
          'should': [
@ -30,13 +28,6 @@ module.exports = {
          ]
        }
      },
-          'filter': {
-            'bool': {
-              'must': []
-            }
-          }
-        }
-      },
      'max_boost': 20,
      'functions': [
        {
--- a/test/unit/fixture/structured_geocoding/with_source_filtering.json
+++ b/test/unit/fixture/structured_geocoding/with_source_filtering.json
@ -1,13 +1,10 @@
 {
  "query": {
    "function_score": {
-      "query": {
-        "filtered": {
      "query": {
        "bool": {
-              "should": []
-            }
-          },
+          "should": [
+          ],
          "filter": {
            "bool": {
              "must": [