Skip to content

Commit

Permalink
OSS logic added to test environment (#60134) (#60179)
Browse files Browse the repository at this point in the history
* OSS logic added

* reverting the logic of isOSS()

TileMap and RegionMap are on OSS but not on x-pack because it has Maps.
  • Loading branch information
rashmivkulkarni authored Mar 14, 2020
1 parent 1cf7368 commit 3f27bf1
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions test/functional/apps/visualize/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
import { FtrProviderContext } from '../../ftr_provider_context.d';

// eslint-disable-next-line @typescript-eslint/no-namespace, import/no-default-export
export default function({ getService, loadTestFile }: FtrProviderContext) {
export default function({ getService, getPageObjects, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects(['common']);
let isOss = true;

describe('visualize app', () => {
before(async () => {
Expand All @@ -37,6 +39,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
defaultIndex: 'logstash-*',
'format:bytes:defaultPattern': '0,0.[000]b',
});
isOss = await PageObjects.common.isOss();
});

describe('', function() {
Expand Down Expand Up @@ -66,20 +69,22 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {

loadTestFile(require.resolve('./_line_chart'));
loadTestFile(require.resolve('./_pie_chart'));
loadTestFile(require.resolve('./_region_map'));
loadTestFile(require.resolve('./_point_series_options'));
loadTestFile(require.resolve('./_markdown_vis'));
loadTestFile(require.resolve('./_shared_item'));
loadTestFile(require.resolve('./_lab_mode'));
loadTestFile(require.resolve('./_linked_saved_searches'));
loadTestFile(require.resolve('./_visualize_listing'));
if (isOss) {
loadTestFile(require.resolve('./_tile_map'));
loadTestFile(require.resolve('./_region_map'));
}
});

describe('', function() {
this.tags('ciGroup12');

loadTestFile(require.resolve('./_tag_cloud'));
loadTestFile(require.resolve('./_tile_map'));
loadTestFile(require.resolve('./_vertical_bar_chart'));
loadTestFile(require.resolve('./_vertical_bar_chart_nontimeindex'));
loadTestFile(require.resolve('./_tsvb_chart'));
Expand Down

0 comments on commit 3f27bf1

Please sign in to comment.