Skip to content

Commit 484ee0a

Browse files
committed
Merge pull request #13962 from Mpdreamz/fix/get-field-mapping-rest-tests
Fix indices.get_field_mapping rest tests
2 parents 7b431ec + fd1cd60 commit 484ee0a

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ setup:
1818

1919
- do:
2020
indices.get_field_mapping:
21-
field: text
21+
fields: text
2222

2323
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
2424

@@ -27,7 +27,7 @@ setup:
2727
- do:
2828
indices.get_field_mapping:
2929
index: test_index
30-
field: text
30+
fields: text
3131

3232
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
3333

@@ -38,7 +38,7 @@ setup:
3838
indices.get_field_mapping:
3939
index: test_index
4040
type: test_type
41-
field: text
41+
fields: text
4242

4343
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
4444

@@ -49,7 +49,7 @@ setup:
4949
indices.get_field_mapping:
5050
index: test_index
5151
type: test_type
52-
field: [ text , text1 ]
52+
fields: [ text , text1 ]
5353

5454
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
5555
- is_false: test_index.mappings.test_type.text1
@@ -61,19 +61,19 @@ setup:
6161
indices.get_field_mapping:
6262
index: test_index
6363
type: test_type
64-
field: text
64+
fields: text
6565
include_defaults: true
6666

6767
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
6868
- match: {test_index.mappings.test_type.text.mapping.text.analyzer: default}
6969

7070
---
71-
"Get field mapping should work without index specifying type and field":
71+
"Get field mapping should work without index specifying type and fields":
7272

7373
- do:
7474
indices.get_field_mapping:
7575
type: test_type
76-
field: text
76+
fields: text
7777

7878
- match: {test_index.mappings.test_type.text.mapping.text.type: string}
7979

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
indices.get_field_mapping:
2020
index: test_index
2121
type: test_type
22-
field: not_existent
22+
fields: not_existent
2323

2424
- match: { '': {}}

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
indices.get_field_mapping:
2121
index: test_index
2222
type: not_test_type
23-
field: text
23+
fields: text
2424

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
indices.get_field_mapping:
77
index: test_index
88
type: type
9-
field: field
9+
fields: field
1010

1111

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ setup:
4949

5050
- do:
5151
indices.get_field_mapping:
52-
field: "*"
52+
fields: "*"
5353

5454
- match: {test_index.mappings.test_type.t1.full_name: t1 }
5555
- match: {test_index.mappings.test_type.t2.full_name: t2 }
@@ -63,7 +63,7 @@ setup:
6363
- do:
6464
indices.get_field_mapping:
6565
index: test_index
66-
field: "t*"
66+
fields: "t*"
6767

6868
- match: {test_index.mappings.test_type.t1.full_name: t1 }
6969
- match: {test_index.mappings.test_type.t2.full_name: t2 }
@@ -75,7 +75,7 @@ setup:
7575
- do:
7676
indices.get_field_mapping:
7777
index: test_index
78-
field: "*t1"
78+
fields: "*t1"
7979
- match: {test_index.mappings.test_type.t1.full_name: t1 }
8080
- match: {test_index.mappings.test_type.obj\.t1.full_name: obj.t1 }
8181
- match: {test_index.mappings.test_type.obj\.i_t1.full_name: obj.i_t1 }
@@ -87,7 +87,7 @@ setup:
8787
- do:
8888
indices.get_field_mapping:
8989
index: test_index
90-
field: "obj.i_*"
90+
fields: "obj.i_*"
9191
- match: {test_index.mappings.test_type.obj\.i_t1.full_name: obj.i_t1 }
9292
- match: {test_index.mappings.test_type.obj\.i_t3.full_name: obj.i_t3 }
9393
- length: {test_index.mappings.test_type: 2}
@@ -99,7 +99,7 @@ setup:
9999
indices.get_field_mapping:
100100
index: _all
101101
type: _all
102-
field: "t*"
102+
fields: "t*"
103103
- match: {test_index.mappings.test_type.t1.full_name: t1 }
104104
- match: {test_index.mappings.test_type.t2.full_name: t2 }
105105
- length: {test_index.mappings.test_type: 2}
@@ -114,7 +114,7 @@ setup:
114114
indices.get_field_mapping:
115115
index: '*'
116116
type: '*'
117-
field: "t*"
117+
fields: "t*"
118118
- match: {test_index.mappings.test_type.t1.full_name: t1 }
119119
- match: {test_index.mappings.test_type.t2.full_name: t2 }
120120
- length: {test_index.mappings.test_type: 2}
@@ -129,7 +129,7 @@ setup:
129129
indices.get_field_mapping:
130130
index: 'test_index,test_index_2'
131131
type: 'test_type,test_type_2'
132-
field: "t*"
132+
fields: "t*"
133133
- match: {test_index.mappings.test_type.t1.full_name: t1 }
134134
- match: {test_index.mappings.test_type.t2.full_name: t2 }
135135
- length: {test_index.mappings.test_type: 2}

0 commit comments

Comments
 (0)