Skip to content

Commit

Permalink
[Tests] More easy fixes for unit tests
Browse files Browse the repository at this point in the history
8 failures still. Committing here because the remaining but require
an agreement of next steps.

Signed-off-by: Kawika Avilla <[email protected]>
  • Loading branch information
kavilla committed Mar 24, 2021
1 parent 79c20a8 commit 7d42286
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ test('return manifest when plugin expected OpenSearch Dashboards version is `ope
JSON.stringify({
id: 'someId',
version: 'some-version',
opensearchDashboardsVersion: 'opensearch-dashboards',
opensearchDashboardsVersion: 'opensearchDashboards',
requiredPlugins: ['some-required-plugin'],
server: true,
ui: true,
Expand All @@ -416,7 +416,7 @@ test('return manifest when plugin expected OpenSearch Dashboards version is `ope
id: 'someId',
configPath: 'some_id',
version: 'some-version',
opensearchDashboardsVersion: 'opensearch-dashboards',
opensearchDashboardsVersion: 'opensearchDashboards',
optionalPlugins: [],
requiredPlugins: ['some-required-plugin'],
requiredBundles: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('utils/osd_field_types', () => {
test('returns a OsdFieldType instance by name', () => {
const osdFieldType = getOsdFieldType(OPENSEARCH_FIELD_TYPES.STRING);

expect(osdFieldType).toBeInstanceOf(osdFieldType);
expect(osdFieldType).toBeInstanceOf(OsdFieldType);
expect(osdFieldType).toHaveProperty('name', OPENSEARCH_FIELD_TYPES.STRING);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('OpenSearch search strategy', () => {
get: () => {},
},
},
elasticsearch: { client: { asCurrentUser: { search: mockApiCaller } } },
opensearch: { client: { asCurrentUser: { search: mockApiCaller } } },
},
};
const mockConfig$ = pluginInitializerContextConfigMock<any>({}).legacy.globalConfig$;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* under the License.
*/

import { elasticsearchServiceMock } from '../../../../../core/server/mocks';
import { opensearchServiceMock } from '../../../../../core/server/mocks';
import { shimAbortSignal } from '.';

describe('shimAbortSignal', () => {
it('aborts the promise if the signal is aborted', () => {
const promise = elasticsearchServiceMock.createSuccessTransportRequestPromise({
const promise = opensearchServiceMock.createSuccessTransportRequestPromise({
success: true,
});
const controller = new AbortController();
Expand All @@ -33,7 +33,7 @@ describe('shimAbortSignal', () => {
});

it('returns the original promise', async () => {
const promise = elasticsearchServiceMock.createSuccessTransportRequestPromise({
const promise = opensearchServiceMock.createSuccessTransportRequestPromise({
success: true,
});
const controller = new AbortController();
Expand All @@ -43,7 +43,7 @@ describe('shimAbortSignal', () => {
});

it('allows the promise to be aborted manually', () => {
const promise = elasticsearchServiceMock.createSuccessTransportRequestPromise({
const promise = opensearchServiceMock.createSuccessTransportRequestPromise({
success: true,
});
const controller = new AbortController();
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/data/server/search/routes/msearch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('msearch route', () => {
const mockClient = { msearch: jest.fn().mockResolvedValue(response) };
const mockContext = {
core: {
elasticsearch: { client: { asCurrentUser: mockClient } },
opensearch: { client: { asCurrentUser: mockClient } },
uiSettings: { client: { get: jest.fn() } },
},
};
Expand Down Expand Up @@ -99,7 +99,7 @@ describe('msearch route', () => {
};
const mockContext = {
core: {
elasticsearch: { client: { asCurrentUser: mockClient } },
opensearch: { client: { asCurrentUser: mockClient } },
uiSettings: { client: { get: jest.fn() } },
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ test('should add `noreferrer` and `nooopener` to unknown links in new tabs', ()
expect(component.render().find('a').prop('rel')).toBe('noopener noreferrer');
});

test('should only add `nooopener` to known links in new tabs', () => {
// TODO: In @elastic/eui/src/services/url.ts it is unknown if it does not match the regex
// TODO: [renameme] if we fork EUI and update that regex then we can include this test again
xtest('should only add `nooopener` to known links in new tabs', () => {
const component = shallow(
<Markdown openLinksInNewTab={true} markdown="[link](https://www.opensearch.co/cool/path" />
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import {
savedObjectsRepositoryMock,
loggingSystemMock,
opensearchDashboardsServiceMock,
opensearchServiceMock,
} from '../../../../../core/server/mocks';
import {
CollectorOptions,
Expand Down Expand Up @@ -54,7 +54,7 @@ describe('telemetry_application_usage', () => {
const getUsageCollector = jest.fn();
const registerType = jest.fn();
const callCluster = jest.fn();
const opensearchClient = opensearchDashboardsServiceMock.createClusterClient().asInternalUser;
const opensearchClient = opensearchServiceMock.createClusterClient().asInternalUser;

beforeAll(() =>
registerApplicationUsageCollector(logger, usageCollectionMock, registerType, getUsageCollector)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('telemetry_opensearch_dashboards', () => {

test('fetch', async () => {
expect(await collector.fetch(callCluster)).toStrictEqual({
index: '.opensearch_dashboards-tests',
index: '.opensearch_dashboards_tests',
dashboard: { total: 0 },
visualization: { total: 0 },
search: { total: 0 },
Expand All @@ -59,7 +59,7 @@ describe('telemetry_opensearch_dashboards', () => {

test('formatForBulkUpload', async () => {
const resultFromFetch = {
index: '.opensearch_dashboards-tests',
index: '.opensearch_dashboards_tests',
dashboard: { total: 0 },
visualization: { total: 0 },
search: { total: 0 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { SavedObjectsClientContract, SavedObject } from 'opensearch-dashboards/s
import { savedObjectsClientMock, loggingSystemMock } from '../../../../../core/server/mocks';

describe('shortUrlLookupProvider', () => {
const ID = 'bf00ad16941fc51420f91a93428b27a0';
const ID = '631b8fa45c5d0b8948aaf38cc3a001ca';
const TYPE = 'url';
const URL = 'http://opensearch.co';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ describe('VegaParser._resolveOpenSearchQueries', () => {
test(
'opensearch 2',
check(
{ data: { name: 'requestId', url: { '%type%': 'elasticsearch', index: 'a' } } },
{ data: { name: 'requestId', url: { '%type%': 'opensearch', index: 'a' } } },
{ data: { name: 'requestId', url: { index: 'a', body: {} }, values: [42] } }
)
);
Expand Down

0 comments on commit 7d42286

Please sign in to comment.