[Tests] Updates for integration tests (#208)

packages/osd-plugin-generator/template/public/components/app.tsx.ejs

@@ -50,8 +50,7 @@ import { CoreStart } from '<%= importFromRoot('src/core/public') %>';
                       };
 
                       // Render the application DOM.
-                      // Note that `navigation.ui.TopNavMenu` is a stateful component exported on the `navigation`
-                      plugin's start contract.
+                      // Note that `navigation.ui.TopNavMenu` is a stateful component exported on the `navigation` plugin's start contract.
                       return (
                       <Router basename={basename}>
                         <I18nProvider>

src/core/public/application/integration_tests/router.test.tsx

@@ -107,7 +107,7 @@ describe('AppRouter', () => {
 
     expect(app1.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -119,7 +119,7 @@ describe('AppRouter', () => {
     expect(app1Unmount).toHaveBeenCalled();
     expect(app2.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /app/app2
       html: <div>App 2</div>
       </div></div>"
@@ -133,7 +133,7 @@ describe('AppRouter', () => {
 
     expect(standardApp.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -145,7 +145,7 @@ describe('AppRouter', () => {
     expect(standardAppUnmount).toHaveBeenCalled();
     expect(chromelessApp.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"
@@ -157,7 +157,7 @@ describe('AppRouter', () => {
     expect(chromelessAppUnmount).toHaveBeenCalled();
     expect(standardApp.mounter.mount).toHaveBeenCalledTimes(2);
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -171,7 +171,7 @@ describe('AppRouter', () => {
 
     expect(chromelessAppA.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"
@@ -183,7 +183,7 @@ describe('AppRouter', () => {
     expect(chromelessAppAUnmount).toHaveBeenCalled();
     expect(chromelessAppB.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /chromeless-b/path
       html: <div>Chromeless B</div>
       </div></div>"
@@ -195,7 +195,7 @@ describe('AppRouter', () => {
     expect(chromelessAppBUnmount).toHaveBeenCalled();
     expect(chromelessAppA.mounter.mount).toHaveBeenCalledTimes(2);
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"heatmap\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingSpinner euiLoadingSpinner--xLarge\\" aria-label=\\"Loading application\\"></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"

src/core/public/application/ui/app_container.tsx

@@ -25,7 +25,7 @@ import React, {
   useState,
   MutableRefObject,
 } from 'react';
-import { EuiLoadingElastic } from '@elastic/eui';
+import { EuiLoadingSpinner } from '@elastic/eui';
 
 import type { MountPoint } from '../../types';
 import { AppLeaveHandler, AppStatus, AppUnmount, Mounter } from '../types';
@@ -120,7 +120,7 @@ export const AppContainer: FunctionComponent<Props> = ({
       {appNotFound && <AppNotFound />}
       {showSpinner && (
         <div className="appContainer__loading">
-          <EuiLoadingElastic aria-label="Loading application" size="xxl" />
+          <EuiLoadingSpinner aria-label="Loading application" size="xl" />
         </div>
       )}
       <div key={appId} ref={elementRef} />

src/core/server/http/integration_tests/core_service.test.mocks.ts

@@ -26,8 +26,8 @@ jest.doMock('../../opensearch/legacy/scoped_cluster_client', () => ({
   ),
 }));
 
-jest.doMock('opensearch', () => {
-  const realOpenSearch = jest.requireActual('opensearch');
+jest.doMock('elasticsearch', () => {
+  const realOpenSearch = jest.requireActual('elasticsearch');
   return {
     ...realOpenSearch,
     // eslint-disable-next-line object-shorthand

src/core/server/saved_objects/routes/integration_tests/migrate.test.mocks.ts

@@ -23,6 +23,6 @@ export const migratorInstanceMock = mockOpenSearchDashboardsMigrator.create();
 export const OpenSearchDashboardsMigratorMock = jest
   .fn()
   .mockImplementation(() => migratorInstanceMock);
-jest.doMock('../../migrations/opensearch-dashboards/opensearch_dashboards_migrator', () => ({
+jest.doMock('../../migrations/opensearch_dashboards/opensearch_dashboards_migrator', () => ({
   OpenSearchDashboardsMigrator: OpenSearchDashboardsMigratorMock,
 }));

src/core/server/saved_objects/saved_objects_type_registry.mock.ts

@@ -39,8 +39,8 @@ const createRegistryMock = (): jest.Mocked<
   mock.getVisibleTypes.mockReturnValue([]);
   mock.getAllTypes.mockReturnValue([]);
   mock.getImportableAndExportableTypes.mockReturnValue([]);
-  mock.getIndex.mockReturnValue('.opensearch_dashboards-test');
-  mock.getIndex.mockReturnValue('.opensearch_dashboards-test');
+  mock.getIndex.mockReturnValue('.opensearch_dashboards_test');
+  mock.getIndex.mockReturnValue('.opensearch_dashboards_test');
   mock.isHidden.mockReturnValue(false);
   mock.isNamespaceAgnostic.mockImplementation((type: string) => type === 'global');
   mock.isSingleNamespace.mockImplementation(

src/core/server/saved_objects/service/lib/repository.test.js

@@ -237,7 +237,7 @@ describe('SavedObjectsRepository', () => {
     const allowedTypes = [...new Set(allTypes.filter((type) => !registry.isHidden(type)))];
 
     savedObjectsRepository = new SavedObjectsRepository({
-      index: '.opensearch_dashboards-test',
+      index: '.opensearch_dashboards_test',
       mappings,
       client,
       migrator,
@@ -689,7 +689,7 @@ describe('SavedObjectsRepository', () => {
         await bulkCreateSuccess([obj1, obj2]);
         expectClientCallArgsAction([obj1, obj2], {
           method: 'create',
-          _index: '.opensearch_dashboards-test',
+          _index: '.opensearch_dashboards_test',
         });
       });
 
@@ -1937,7 +1937,7 @@ describe('SavedObjectsRepository', () => {
       it(`should use default index`, async () => {
         await createSuccess(type, attributes, { id });
         expect(client.create).toHaveBeenCalledWith(
-          expect.objectContaining({ index: '.opensearch_dashboards-test' }),
+          expect.objectContaining({ index: '.opensearch_dashboards_test' }),
           expect.anything()
         );
       });
@@ -2416,7 +2416,7 @@ describe('SavedObjectsRepository', () => {
       it(`should use all indices for types that are not namespace-agnostic`, async () => {
         await deleteByNamespaceSuccess(namespace);
         expect(client.updateByQuery).toHaveBeenCalledWith(
-          expect.objectContaining({ index: ['.opensearch_dashboards-test', 'custom'] }),
+          expect.objectContaining({ index: ['.opensearch_dashboards_test', 'custom'] }),
           expect.anything()
         );
       });
@@ -3450,7 +3450,7 @@ describe('SavedObjectsRepository', () => {
         it(`should use default index`, async () => {
           const expectFn = () =>
             expect(client.delete).toHaveBeenCalledWith(
-              expect.objectContaining({ index: '.opensearch_dashboards-test' }),
+              expect.objectContaining({ index: '.opensearch_dashboards_test' }),
               expect.anything()
             );
           await deleteFromNamespacesSuccessDelete(expectFn);
@@ -3527,7 +3527,7 @@ describe('SavedObjectsRepository', () => {
         it(`should use default index`, async () => {
           const expectFn = () =>
             expect(client.update).toHaveBeenCalledWith(
-              expect.objectContaining({ index: '.opensearch_dashboards-test' }),
+              expect.objectContaining({ index: '.opensearch_dashboards_test' }),
               expect.anything()
             );
           await deleteFromNamespacesSuccessUpdate(expectFn);

src/core/server/saved_objects/service/lib/repository_create_repository.test.ts

@@ -79,7 +79,7 @@ describe('SavedObjectsRepository#createRepository', () => {
       originalRepository.createRepository(
         (migrator as unknown) as OpenSearchDashboardsMigrator,
         typeRegistry,
-        '.opensearch_dashboards-test',
+        '.opensearch_dashboards_test',
         callAdminCluster,
         ['unMappedType1', 'unmappedType2']
       );
@@ -94,7 +94,7 @@ describe('SavedObjectsRepository#createRepository', () => {
     const repository = originalRepository.createRepository(
       (migrator as unknown) as OpenSearchDashboardsMigrator,
       typeRegistry,
-      '.opensearch_dashboards-test',
+      '.opensearch_dashboards_test',
       callAdminCluster,
       [],
       SavedObjectsRepository
@@ -112,7 +112,7 @@ describe('SavedObjectsRepository#createRepository', () => {
     const repository = originalRepository.createRepository(
       (migrator as unknown) as OpenSearchDashboardsMigrator,
       typeRegistry,
-      '.opensearch_dashboards-test',
+      '.opensearch_dashboards_test',
       callAdminCluster,
       ['hiddenType', 'hiddenType', 'hiddenType'],
       SavedObjectsRepository

src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts

@@ -82,7 +82,8 @@ describe('createOrUpgradeSavedConfig()', () => {
     await osd.stop();
   }, 30000);
 
-  it('upgrades the previous version on each increment', async function () {
+  // TODO: [RENAMEME] Test can be enabled once there is a valid snapshot URL
+  xit('upgrades the previous version on each increment', async function () {
     // ------------------------------------
     // upgrade to 5.4.0
     await createOrUpgradeSavedConfig({

src/core/server/ui_settings/integration_tests/index.test.ts

@@ -23,7 +23,8 @@ import { docExistsSuite } from './doc_exists';
 import { docMissingSuite } from './doc_missing';
 import { docMissingAndIndexReadOnlySuite } from './doc_missing_and_index_read_only';
 
-describe('uiSettings/routes', function () {
+// TODO: [RENAMEME] Test can be enabled once there is a valid snapshot URL
+xdescribe('uiSettings/routes', function () {
   jest.setTimeout(10000);
 
   beforeAll(startServers);

src/core/test_helpers/osd_server.ts

@@ -149,7 +149,7 @@ export const request: Record<
   put: (root, path) => getSupertest(root, 'put', path),
 };
 
-export interface TestOpenSearchhServer {
+export interface TestOpenSearchServer {
   getStartTimeout: () => number;
   start: (opensearchArgs: string[], opensearchEnvVars: Record<string, string>) => Promise<void>;
   stop: () => Promise<void>;
@@ -161,7 +161,7 @@ export interface TestOpenSearchhServer {
 
 export interface TestOpenSearchUtils {
   stop: () => Promise<void>;
-  opensearch: TestOpenSearchhServer;
+  opensearch: TestOpenSearchServer;
   hosts: string[];
   username: string;
   password: string;
@@ -262,14 +262,14 @@ export function createTestServers({
           opensearchPort: opensearchTestConfig.getUrlParts().port,
           updates: [
             ...usersToBeAdded,
-            // user elastic
+            // user opensearch
             opensearchTestConfig.getUrlParts(),
             // user opensearchDashboards
             osdTestConfig.getUrlParts(),
           ],
         });
 
-        // Override provided configs, we know what the elastic user is now
+        // Override provided configs, we know what the opensearch user is now
         osdSettings.opensearch = {
           hosts: [opensearchTestConfig.getUrl()],
           username: opensearchDashboardsServerTestUser.username,

src/plugins/usage_collection/server/routes/integration_tests/stats.test.ts

@@ -63,7 +63,7 @@ describe('/api/stats', () => {
       }),
       config: {
         allowAnonymous: true,
-        opensearchDashboardsIndex: '.opensearch_dashboards-test',
+        opensearchDashboardsIndex: '.opensearch_dashboards_test',
         opensearchDashboardsVersion: '8.8.8-SNAPSHOT',
         server: {
           name: 'myopensearchDashboards',
@@ -86,10 +86,10 @@ describe('/api/stats', () => {
   it('successfully returns data', async () => {
     const response = await supertest(httpSetup.server.listener).get('/api/stats').expect(200);
     expect(response.body).toMatchObject({
-      opensearchDashboards: {
+      opensearch_dashboards: {
         uuid: 'xxx-xxxxx',
         name: 'myopensearchDashboards',
-        index: '.opensearch_dashboards-test',
+        index: '.opensearch_dashboards_test',
         host: 'myopensearchDashboards.com',
         locale: 'en',
         transport_address: `myopensearchDashboards.com:1234`,