From fc9b4b7b9a252c3d3287f7a9a97cc913c3e4acc1 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Thu, 24 Aug 2023 21:03:33 -0500
Subject: [PATCH] [data views] fix fields for wildcard integration test
 (#164772)

I'm waiting for this to fail CI - this means that a new ES snapshot is
being used. Then we update the test snapshot and should be good to
merge.

The lastest ES snapshot is returning field types in a different order
which really doesn't matter to this endpoint so I'll just update the
snapshot.

Closes https://github.com/elastic/kibana/issues/164753
---
 .../fields_for_wildcard_route/conflicts.js            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
index 95977266b849f..4efd0e4942bee 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
@@ -12,8 +12,7 @@ export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  // FAILING ES FORWARD COMPATIBILITY: https://github.com/elastic/kibana/issues/165633
-  describe.skip('conflicts', () => {
+  describe('conflicts', () => {
     before(() =>
       esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/conflicts')
     );
@@ -41,7 +40,7 @@ export default function ({ getService }) {
               {
                 name: 'number_conflict',
                 type: 'number',
-                esTypes: ['integer', 'float'],
+                esTypes: ['float', 'integer'],
                 aggregatable: true,
                 searchable: true,
                 readFromDocValues: true,
@@ -50,16 +49,16 @@ export default function ({ getService }) {
               {
                 name: 'string_conflict',
                 type: 'string',
-                esTypes: ['text', 'keyword'],
+                esTypes: ['keyword', 'text'],
                 aggregatable: true,
                 searchable: true,
-                readFromDocValues: false,
+                readFromDocValues: true,
                 metadata_field: false,
               },
               {
                 name: 'success',
                 type: 'conflict',
-                esTypes: ['boolean', 'keyword'],
+                esTypes: ['keyword', 'boolean'],
                 aggregatable: true,
                 searchable: true,
                 readFromDocValues: false,