Fix new analysis-common yml tests

These tests are broken because I added them with the `yml` extension
and didn't realize that we weren't running tests with that extension
until we merged #24659. I used that extension in anticipation of #24659
but didn't verify that the tests were actually running. Ooops!

Closes #24734

modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml

@@ -25,7 +25,7 @@
           mappings:
             doc:
               properties:
-                body:
+                text:
                   type: text
                   analyzer: index
                   search_analyzer: search
@@ -43,9 +43,10 @@
         body:
           query:
             match:
-              text: fox runs
+              text:
+                query: fox runs
                 operator: AND
-  - match: {hits.count: 1}
+  - match: {hits.total: 1}
 
   - do:
       index:
@@ -60,6 +61,7 @@
         body:
           query:
             match:
-              text: fox runs
+              text:
+                query: fox runs
                 operator: AND
-  - match: {hits.count: 2}
+  - match: {hits.total: 2}

modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml

@@ -5,6 +5,14 @@
       indices.create:
         index: test
         body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 1
+            analysis:
+              analyzer:
+                has_payloads:
+                  tokenizer: standard
+                  filter: [type_as_payload]
           mappings:
             doc:
               properties:
@@ -12,14 +20,6 @@
                   type: text
                   term_vector: with_positions_offsets_payloads
                   analyzer: has_payloads
-              settings:
-                number_of_shards: 1
-                number_of_replicas: 1
-                analysis:
-                  analyzer:
-                    had_payloads:
-                      tokenizer: standard
-                      filter: [type_as_payload]
 
   - do:
       index:
@@ -37,4 +37,4 @@
         id:    1
         payloads: true
   - match: {term_vectors.text.field_statistics.sum_doc_freq: 5}
-  - match: {term_vectors.text.terms.brown.tokens.0.payload: 10}
+  - match: {term_vectors.text.terms.brown.tokens.0.payload: PEFMUEhBTlVNPg==}