Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NP] Move visTypeVislib into NP #63963

Merged
merged 17 commits into from
Apr 28, 2020
Merged

[NP] Move visTypeVislib into NP #63963

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3911e57
Move vis_type_vislib into NP
sulemanof Apr 20, 2020
a7cb184
Merge remote-tracking branch 'upstream/master' into np/vis_type_vislib
sulemanof Apr 20, 2020
57f8338
Move the rest of tests to jest, do a clean up
sulemanof Apr 21, 2020
99197ad
Merge remote-tracking branch 'upstream/master' into np/vis_type_vislib
sulemanof Apr 21, 2020
a861935
Merge branch 'master' into np/vis_type_vislib
sulemanof Apr 23, 2020
2a038b2
Divide legacy helpers
sulemanof Apr 23, 2020
05a5e9e
Add licenses to mock data, fix eslint issues
sulemanof Apr 23, 2020
ebbb1be
Merge remote-tracking branch 'upstream/master' into np/vis_type_vislib
sulemanof Apr 23, 2020
9c0f47e
move test styles to tests_bundle
flash1293 Apr 24, 2020
eefb960
Merge pull request #2 from flash1293/np/vis_type_vislib-styles
sulemanof Apr 24, 2020
c59d718
Merge remote-tracking branch 'upstream/master' into np/vis_type_vislib
sulemanof Apr 24, 2020
cfa58b1
Merge remote-tracking branch 'upstream/master' into np/vis_type_vislib
flash1293 Apr 25, 2020
6a82d9c
fix eslint warnings
flash1293 Apr 25, 2020
835cf4a
Revert "fix eslint warnings"
flash1293 Apr 25, 2020
9b12ef6
fix linting exception
flash1293 Apr 25, 2020
0382708
Merge branch 'master' into np/vis_type_vislib
elasticmachine Apr 26, 2020
62400d6
Merge branch 'master' into np/vis_type_vislib
elasticmachine Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ bower_components
/html_docs
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
/src/plugins/vis_type_timelion/public/_generated_/**
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
/src/legacy/ui/public/flot-charts
/test/fixtures/scenarios
/src/legacy/core_plugins/console/public/webpackShims
Expand Down
3 changes: 3 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ module.exports = {
'(src|x-pack)/legacy/**/*',
'(src|x-pack)/plugins/**/(public|server)/**/*',
'examples/**/*',
// next folder contains legacy browser tests which can't be migrated to jest
// which import np files
'!src/legacy/core_plugins/kibana/public/__tests__/**/*',
],
from: [
'src/core/public/**/*',
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
/src/plugins/vis_type_vislib/ @elastic/kibana-app
/src/plugins/vis_type_xy/ @elastic/kibana-app
/src/plugins/vis_type_table/ @elastic/kibana-app
/src/plugins/kibana_legacy/ @elastic/kibana-app
Expand Down
6 changes: 3 additions & 3 deletions .i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"visTypeMetric": "src/plugins/vis_type_metric",
"visTypeTable": "src/plugins/vis_type_table",
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
"visTypeVega": "src/plugins/vis_type_vega",
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
"visTypeVislib": "src/plugins/vis_type_vislib",
"visTypeXy": "src/plugins/vis_type_xy",
"visualizations": "src/plugins/visualizations",
"visualize": "src/plugins/visualize"
},
Expand Down
4 changes: 2 additions & 2 deletions .sass-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ files:
include:
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
- 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
Expand Down
1 change: 0 additions & 1 deletion src/dev/precommit_hook/casing_check_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
'src/legacy/core_plugins/tile_map/public/__tests__/shadedCircleMarkers.png',
'src/legacy/core_plugins/tile_map/public/__tests__/shadedGeohashGrid.png',
'src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json',
'src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js',
'src/core/server/core_app/assets/favicons/android-chrome-192x192.png',
'src/core/server/core_app/assets/favicons/android-chrome-256x256.png',
'src/core/server/core_app/assets/favicons/android-chrome-512x512.png',
Expand Down
18 changes: 2 additions & 16 deletions ...ib/__tests__/lib/fixtures/_vis_fixture.js → ...__tests__/vis_type_vislib/_vis_fixture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@
import _ from 'lodash';
import $ from 'jquery';

import { Vis } from '../../../vis';
import { Vis } from '../../../../../../plugins/vis_type_vislib/public/vislib/vis';

// TODO: Remove when converted to jest mocks
import {
ColorsService,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
} from '../../../../../../../../plugins/charts/public/services';
import { ColorsService } from '../../../../../../plugins/charts/public/services';

const $visCanvas = $('<div>')
.attr('id', 'vislib-vis-fixtures')
Expand Down Expand Up @@ -72,17 +69,6 @@ const getDeps = () => {
};
};

export const getMockUiState = () => {
const map = new Map();

return (() => ({
get: (...args) => map.get(...args),
set: (...args) => map.set(...args),
setSilent: (...args) => map.set(...args),
on: () => undefined,
}))();
};

export function getVis(visLibParams, element) {
return new Vis(
element || $visCanvas.new(),
Expand Down
6 changes: 3 additions & 3 deletions ...ublic/vislib/__tests__/lib/chart_title.js → ...ests__/vis_type_vislib/lib/chart_title.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import d3 from 'd3';
import _ from 'lodash';
import expect from '@kbn/expect';

import { ChartTitle } from '../../lib/chart_title';
import { VisConfig } from '../../lib/vis_config';
import { getMockUiState } from './fixtures/_vis_fixture';
import { ChartTitle } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/chart_title';
import { VisConfig } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';

describe('Vislib ChartTitle Class Test Suite', function() {
let mockUiState;
Expand Down
5 changes: 3 additions & 2 deletions ...b/public/vislib/__tests__/lib/dispatch.js → ...__tests__/vis_type_vislib/lib/dispatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ import d3 from 'd3';
import expect from '@kbn/expect';

// Data
import data from './fixtures/mock_data/date_histogram/_series';
import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';

import { getVis, getMockUiState } from './fixtures/_vis_fixture';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

describe('Vislib Dispatch Class Test Suite', function() {
function destroyVis(vis) {
Expand Down
12 changes: 6 additions & 6 deletions ...c/vislib/__tests__/lib/handler/handler.js → ...__/vis_type_vislib/lib/handler/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import expect from '@kbn/expect';
import $ from 'jquery';

// Data
import series from '../fixtures/mock_data/date_histogram/_series';
import columns from '../fixtures/mock_data/date_histogram/_columns';
import rows from '../fixtures/mock_data/date_histogram/_rows';
import stackedSeries from '../fixtures/mock_data/date_histogram/_stacked_series';

import { getVis, getMockUiState } from '../fixtures/_vis_fixture';
import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../../_vis_fixture';

const dateHistogramArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
Expand Down
16 changes: 8 additions & 8 deletions ...lic/vislib/__tests__/lib/layout/layout.js → ...ts__/vis_type_vislib/lib/layout/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import expect from '@kbn/expect';
import $ from 'jquery';

// Data
import series from '../fixtures/mock_data/date_histogram/_series';
import columns from '../fixtures/mock_data/date_histogram/_columns';
import rows from '../fixtures/mock_data/date_histogram/_rows';
import stackedSeries from '../fixtures/mock_data/date_histogram/_stacked_series';

import { Layout } from '../../../lib/layout/layout';
import { getVis, getMockUiState } from '../fixtures/_vis_fixture';
import { VisConfig } from '../../../lib/vis_config';
import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { Layout } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/layout/layout';
import { VisConfig } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
import { getVis } from '../../_vis_fixture';

const dateHistogramArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
Expand Down
11 changes: 6 additions & 5 deletions ...ype_vislib/public/vislib/__tests__/vis.js → ...a/public/__tests__/vis_type_vislib/vis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ import _ from 'lodash';
import $ from 'jquery';
import expect from '@kbn/expect';

import series from './lib/fixtures/mock_data/date_histogram/_series';
import columns from './lib/fixtures/mock_data/date_histogram/_columns';
import rows from './lib/fixtures/mock_data/date_histogram/_rows';
import stackedSeries from './lib/fixtures/mock_data/date_histogram/_stacked_series';
import { getVis, getMockUiState } from './lib/fixtures/_vis_fixture';
import series from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import columns from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
import rows from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
import stackedSeries from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
import { getMockUiState } from '../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from './_vis_fixture';

const dataArray = [series, columns, rows, stackedSeries];
const names = ['series', 'columns', 'rows', 'stackedSeries'];
Expand Down
15 changes: 8 additions & 7 deletions ...ib/__tests__/visualizations/area_chart.js → ..._type_vislib/visualizations/area_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ import _ from 'lodash';
import $ from 'jquery';
import expect from '@kbn/expect';

import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

const dataTypesArray = {
'series pos': require('../lib/fixtures/mock_data/date_histogram/_series'),
'series pos neg': require('../lib/fixtures/mock_data/date_histogram/_series_pos_neg'),
'series neg': require('../lib/fixtures/mock_data/date_histogram/_series_neg'),
'term columns': require('../lib/fixtures/mock_data/terms/_columns'),
'range rows': require('../lib/fixtures/mock_data/range/_rows'),
stackedSeries: require('../lib/fixtures/mock_data/date_histogram/_stacked_series'),
'series pos': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series'),
'series pos neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg'),
'series neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg'),
'term columns': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns'),
'range rows': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows'),
stackedSeries: require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series'),
};

const visLibParams = {
Expand Down
5 changes: 3 additions & 2 deletions .../vislib/__tests__/visualizations/chart.js → ..._/vis_type_vislib/visualizations/chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
import d3 from 'd3';
import expect from '@kbn/expect';

import { Chart } from '../../visualizations/_chart';
import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import { Chart } from '../../../../../../../plugins/vis_type_vislib/public/vislib/visualizations/_chart';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

describe('Vislib _chart Test Suite', function() {
let vis;
Expand Down
23 changes: 12 additions & 11 deletions .../__tests__/visualizations/column_chart.js → ...ype_vislib/visualizations/column_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,18 @@ import $ from 'jquery';
import expect from '@kbn/expect';

// Data
import series from '../lib/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
import termsColumns from '../lib/fixtures/mock_data/terms/_columns';
import histogramRows from '../lib/fixtures/mock_data/histogram/_rows';
import stackedSeries from '../lib/fixtures/mock_data/date_histogram/_stacked_series';

import { seriesMonthlyInterval } from '../lib/fixtures/mock_data/date_histogram/_series_monthly_interval';
import { rowsSeriesWithHoles } from '../lib/fixtures/mock_data/date_histogram/_rows_series_with_holes';
import rowsWithZeros from '../lib/fixtures/mock_data/date_histogram/_rows';
import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
import histogramRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows';
import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';

import { seriesMonthlyInterval } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval';
import { rowsSeriesWithHoles } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes';
import rowsWithZeros from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

// tuple, with the format [description, mode, data]
const dataTypesArray = [
Expand Down
5 changes: 3 additions & 2 deletions ...b/__tests__/visualizations/gauge_chart.js → ...type_vislib/visualizations/gauge_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import $ from 'jquery';
import _ from 'lodash';
import expect from '@kbn/expect';

import data from '../lib/fixtures/mock_data/terms/_seriesMultiple';
import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

describe('Vislib Gauge Chart Test Suite', function() {
let vis;
Expand Down
14 changes: 7 additions & 7 deletions ...__tests__/visualizations/heatmap_chart.js → ...pe_vislib/visualizations/heatmap_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import d3 from 'd3';
import expect from '@kbn/expect';

// Data
import series from '../lib/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
import termsColumns from '../lib/fixtures/mock_data/terms/_columns';
import stackedSeries from '../lib/fixtures/mock_data/date_histogram/_stacked_series';

import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

// tuple, with the format [description, mode, data]
const dataTypesArray = [
Expand Down
16 changes: 8 additions & 8 deletions ...ib/__tests__/visualizations/line_chart.js → ..._type_vislib/visualizations/line_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import $ from 'jquery';
import _ from 'lodash';

// Data
import seriesPos from '../lib/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
import histogramColumns from '../lib/fixtures/mock_data/histogram/_columns';
import rangeRows from '../lib/fixtures/mock_data/range/_rows';
import termSeries from '../lib/fixtures/mock_data/terms/_series';

import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import seriesPos from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
import histogramColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns';
import rangeRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows';
import termSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';

const dataTypes = [
['series pos', seriesPos],
Expand Down
3 changes: 2 additions & 1 deletion ...lib/__tests__/visualizations/pie_chart.js → ...s_type_vislib/visualizations/pie_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import _ from 'lodash';
import $ from 'jquery';
import expect from '@kbn/expect';

import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
import { getVis } from '../_vis_fixture';
import { pieChartMockData } from './pie_chart_mock_data';

const names = ['rows', 'columns', 'slices'];
Expand Down
0 ...s__/visualizations/pie_chart_mock_data.js → ...lib/visualizations/pie_chart_mock_data.js
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions src/legacy/core_plugins/kibana/public/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@
// Public UI styles
@import 'src/legacy/ui/public/index';

// vis_type_vislib UI styles
@import 'src/legacy/core_plugins/vis_type_vislib/public/index';

// Discover styles
@import 'discover/index';

// Visualization styles are imported here for running karma Browser tests
// should be somehow included through the "visualizations" plugin initialization
@import '../../../../plugins/visualizations/public/index';

// Has to come after visualize because of some
// bad cascading in the Editor layout
@import '../../../../plugins/maps_legacy/public/index';
Expand Down
2 changes: 2 additions & 0 deletions src/legacy/core_plugins/tests_bundle/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

import { createReadStream } from 'fs';
import { resolve } from 'path';

import globby from 'globby';
import MultiStream from 'multistream';
Expand All @@ -40,6 +41,7 @@ export default kibana => {
},

uiExports: {
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
async __bundleProvider__(kbnServer) {
const modules = new Set();

Expand Down
9 changes: 9 additions & 0 deletions src/legacy/core_plugins/tests_bundle/public/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import 'src/legacy/ui/public/styles/styling_constants';

// vis_type_vislib UI styles are imported here for running karma Browser tests
// should be somehow included through the "vis_type_vislib" plugin initialization
@import '../../../../plugins/vis_type_vislib/public/index';

// Visualization styles are imported here for running karma Browser tests
// should be somehow included through the "visualizations" plugin initialization
@import '../../../../plugins/visualizations/public/index';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine, though you probably don't have to repeat this same comment. Just add one at the very top of the file that explains the necessity of the file itself.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cchaos you are right, done.

Loading