summaryrefslogtreecommitdiff
path: root/modules/parent-join/src
diff options
context:
space:
mode:
authorJim Ferenczi <jim.ferenczi@elastic.co>2017-06-07 19:29:01 +0200
committerJim Ferenczi <jim.ferenczi@elastic.co>2017-06-07 19:29:01 +0200
commit3924fd79ef97c04b301024e1d15a92f3049133a2 (patch)
tree34467a5beddb65010f707fae54dfaa827a5c9170 /modules/parent-join/src
parent64cbb93727ab0fbddb8816d3ef50b2c6095afda4 (diff)
Add BWC rest test for parent-join after the backport to 5.x
Diffstat (limited to 'modules/parent-join/src')
-rw-r--r--modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml4
-rw-r--r--modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml6
-rw-r--r--modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml10
3 files changed, 12 insertions, 8 deletions
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml
index f5a5808012..29a50c64f2 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/10_parent_child.yml
@@ -14,8 +14,8 @@ setup:
---
"Parent/child inner hits":
- skip:
- version: " - 5.99.99"
- reason: mapping.single_type was added in 6.0
+ version: " - 5.4.99"
+ reason: mapping.single_type was added in 5.5
- do:
index:
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
index d4f77cbb1f..f142bf61bc 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml
@@ -3,6 +3,8 @@ setup:
indices.create:
index: test
body:
+ settings:
+ mapping.single_type: true
mappings:
doc:
properties:
@@ -13,8 +15,8 @@ setup:
---
"Parent/child inner hits":
- skip:
- version: " - 5.99.99"
- reason: mapping.single_type was added in 6.0
+ version: " - 5.4.99"
+ reason: mapping.single_type was added in 5.5
- do:
index:
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
index 8f6907e323..52a524d2de 100644
--- a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
+++ b/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml
@@ -3,6 +3,8 @@ setup:
indices.create:
index: test
body:
+ settings:
+ mapping.single_type: true
mappings:
doc:
properties:
@@ -60,8 +62,8 @@ setup:
---
"Test basic":
- skip:
- version: " - 5.99.99"
- reason: parent-join was added in 6.0
+ version: " - 5.5.99"
+ reason: parent-join was added in 5.6
- do:
search:
@@ -105,8 +107,8 @@ setup:
---
"Test parent_id query":
- skip:
- version: " - 5.99.99"
- reason: parent-join was added in 6.0
+ version: " - 5.5.99"
+ reason: parent-join was added in 5.6
- do:
search: