Fix integration test cases

Also removed some dead code.
elastic · Aug 10, 2021 · 15194e5 · 15194e5
1 parent bea63d5
commit 15194e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts
@@ -163,16 +163,11 @@ export function importTestSuiteFactory(
             type: 'conflict',
             ...(expectedNewId && { destinationId: expectedNewId }),
           };
-          if (fail409Param === 'ambiguous_conflict_1a1b') {
-            // "ambiguous source" conflict
-            error = {
-              type: 'ambiguous_conflict',
-              destinations: [getConflictDest(`${CID}1`)],
-            };
-          } else if (fail409Param === 'ambiguous_conflict_2c') {
+          if (fail409Param === 'ambiguous_conflict_2c') {
             // "ambiguous destination" conflict
             error = {
               type: 'ambiguous_conflict',
+              // response destinations should be sorted by updatedAt in descending order, then ID in ascending order
               destinations: [getConflictDest(`${CID}2a`), getConflictDest(`${CID}2b`)],
             };
           }

diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -571,15 +571,18 @@ export function copyToSpaceTestSuiteFactory(
               expectNewCopyResponse(response, ambiguousConflictId, title);
             } else {
               // It doesn't matter if overwrite is enabled or not, the object will not be copied because there are two matches in the destination space
-              const updatedAt = '2017-09-21T18:59:16.270Z';
               const destinations = [
-                // response should be sorted by updatedAt in descending order
+                // response destinations should be sorted by updatedAt in descending order, then ID in ascending order
+                {
+                  id: 'conflict_2_all',
+                  title: 'A shared saved-object in all spaces',
+                  updatedAt: '2017-09-21T18:59:16.270Z',
+                },
                 {
                   id: 'conflict_2_space_2',
                   title: 'A shared saved-object in one space',
-                  updatedAt,
+                  updatedAt: '2017-09-21T18:59:16.270Z',
                 },
-                { id: 'conflict_2_all', title: 'A shared saved-object in all spaces', updatedAt },
               ];
               expect(success).to.eql(false);
               expect(successCount).to.eql(0);