Skip to content

Commit b3db7f9

Browse files
archmojarchmoj
authored
Merge pull request #6462 from plotly/simplify-karma-config
Simplify tests by dropping shortcut paths & use main webpack config in karma
2 parents 51e7512 + 2b31c39 commit b3db7f9

File tree

152 files changed

+1084
-1141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1084
-1141
lines changed

‎tasks/util/shortcut_paths.js‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎test/jasmine/assets/check_component.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module.exports = function checkComponent(Plotly) {
6666
describe('registered subplot (gl3d)', function() {
6767
var gd;
6868

69-
var mock = require('@mocks/gl3d_world-cals');
69+
var mock = require('../../image/mocks/gl3d_world-cals');
7070
// just pick out the scatter3d trace
7171
mock.data = [mock.data[1]];
7272
var xaxisCalendar = mock.layout.scene.xaxis.calendar;

‎test/jasmine/assets/check_event_data.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
var Plotly = require('@lib/index');
1+
var Plotly = require('../../../lib/index');
22
var createGraphDiv = require('../assets/create_graph_div');
33
var destroyGraphDiv = require('../assets/destroy_graph_div');
4-
var Lib = require('@src/lib');
4+
var Lib = require('../../../src/lib');
55

66
var hover = require('../assets/hover');
77

‎test/jasmine/assets/check_texttemplate.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var Plotly = require('@lib/index');
4-
var Registry = require('@src/registry');
3+
var Plotly = require('../../../lib/index');
4+
var Registry = require('../../../src/registry');
55

6-
var Lib = require('@src/lib');
6+
var Lib = require('../../../src/lib');
77
var d3Select = require('../../strict-d3').select;
88
var d3SelectAll = require('../../strict-d3').selectAll;
99
var failTest = require('../assets/fail_test');

‎test/jasmine/assets/check_transitions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var Plotly = require('@lib/index');
4-
var Lib = require('@src/lib');
3+
var Plotly = require('../../../lib/index');
4+
var Lib = require('../../../src/lib');
55
var d3Timer = require('../../strict-d3').timer;
66
var d3Select = require('../../strict-d3').select;
77
var d3SelectAll = require('../../strict-d3').selectAll;

‎test/jasmine/assets/click.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var mouseEvent = require('./mouse_event');
2-
var Lib = require('@src/lib');
2+
var Lib = require('../../../src/lib');
33

44
/*
55
* simulated click event at screen pixel position x, y

‎test/jasmine/assets/custom_matchers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
'use strict';
77

88
var isNumeric = require('fast-isnumeric');
9-
var isPlainObject = require('@src/lib/is_plain_object');
10-
var extendDeep = require('@src/lib/extend').extendDeep;
9+
var isPlainObject = require('../../../src/lib/is_plain_object');
10+
var extendDeep = require('../../../src/lib/extend').extendDeep;
1111
var deepEqual = require('deep-equal');
1212

1313
var matchers = {

‎test/jasmine/assets/domain_ref_components.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
// promise is followed by .then(done, done.fail)
1111
'use strict';
1212

13-
var Plotly = require('@lib/index');
13+
var Plotly = require('../../../lib/index');
1414
var d3Select = require('../../strict-d3').select;
1515
var d3SelectAll = require('../../strict-d3').selectAll;
1616
var pixelCalc = require('../assets/pixel_calc');
1717
var getSVGElemScreenBBox = require('../assets/get_svg_elem_screen_bbox');
1818
// var SVGTools = require('../assets/svg_tools');
19-
var Lib = require('@src/lib');
20-
var Axes = require('@src/plots/cartesian/axes');
21-
var axisIds = require('@src/plots/cartesian/axis_ids');
19+
var Lib = require('../../../src/lib');
20+
var Axes = require('../../../src/plots/cartesian/axes');
21+
var axisIds = require('../../../src/plots/cartesian/axis_ids');
2222
var testImage = 'https://images.plot.ly/language-icons/api-home/js-logo.png';
2323
var iterable = require('extra-iterable');
2424

‎test/jasmine/assets/double_click.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var click = require('./click');
22
var getNodeCoords = require('./get_node_coords');
3-
var DBLCLICKDELAY = require('@src/plot_api/plot_config').dfltConfig.doubleClickDelay;
3+
var DBLCLICKDELAY = require('../../../src/plot_api/plot_config').dfltConfig.doubleClickDelay;
44

55
/*
66
* Double click on a point.

‎test/jasmine/assets/mock_lists.js‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
// list of mocks that should include *all* plotly.js trace modules
22

33
var svgMockList = [
4-
['1', require('@mocks/1.json')],
5-
['4', require('@mocks/4.json')],
6-
['5', require('@mocks/5.json')],
7-
['10', require('@mocks/10.json')],
8-
['11', require('@mocks/11.json')],
9-
['17', require('@mocks/17.json')],
10-
['21', require('@mocks/21.json')],
11-
['22', require('@mocks/22.json')],
12-
['airfoil', require('@mocks/airfoil.json')], // important to keep because it's the only mock with config options
13-
['annotations-autorange', require('@mocks/annotations-autorange.json')],
14-
['axes_enumerated_ticks', require('@mocks/axes_enumerated_ticks.json')],
15-
['axes_visible-false', require('@mocks/axes_visible-false.json')],
16-
['bar_and_histogram', require('@mocks/bar_and_histogram.json')],
17-
['waterfall', require('@mocks/waterfall_profit-loss_2018vs2019_rectangle.json')],
18-
['funnel', require('@mocks/funnel_horizontal_group_basic.json')],
19-
['funnelarea', require('@mocks/funnelarea_title_multiple.json')],
20-
['basic_error_bar', require('@mocks/basic_error_bar.json')],
21-
['binding', require('@mocks/binding.json')],
22-
['cheater_smooth', require('@mocks/cheater_smooth.json')],
23-
['finance_style', require('@mocks/finance_style.json')],
24-
['geo_first', require('@mocks/geo_first.json')],
25-
['indicator_bignumber', require('@mocks/indicator_bignumber.json')],
26-
['image_adventurer', require('@mocks/image_adventurer.json')],
27-
['layout_image', require('@mocks/layout_image.json')],
28-
['layout-colorway', require('@mocks/layout-colorway.json')],
29-
['multicategory', require('@mocks/multicategory.json')],
30-
['polar_categories', require('@mocks/polar_categories.json')],
31-
['polar_direction', require('@mocks/polar_direction.json')],
32-
['polar_wind-rose', require('@mocks/polar_wind-rose.json')],
33-
['range_selector_style', require('@mocks/range_selector_style.json')],
34-
['range_slider_multiple', require('@mocks/range_slider_multiple.json')],
35-
['sankey_energy', require('@mocks/sankey_energy.json')],
36-
['sunburst_coffee', require('@mocks/sunburst_coffee.json')],
37-
['treemap_coffee', require('@mocks/treemap_coffee.json')],
38-
['icicle_coffee', require('@mocks/icicle_coffee.json')],
39-
['parcats_bad-displayindex', require('@mocks/parcats_bad-displayindex.json')],
40-
['scattercarpet', require('@mocks/scattercarpet.json')],
41-
['smith_basic', require('@mocks/smith_basic.json')],
42-
['shapes', require('@mocks/shapes.json')],
43-
['splom_iris', require('@mocks/splom_iris.json')],
44-
['table_wrapped_birds', require('@mocks/table_wrapped_birds.json')],
45-
['ternary_fill', require('@mocks/ternary_fill.json')],
46-
['text_chart_arrays', require('@mocks/text_chart_arrays.json')],
47-
['transforms', require('@mocks/transforms.json')],
48-
['updatemenus', require('@mocks/updatemenus.json')],
49-
['violin_side-by-side', require('@mocks/violin_side-by-side.json')],
50-
['world-cals', require('@mocks/world-cals.json')],
4+
['1', require('../../image/mocks/1.json')],
5+
['4', require('../../image/mocks/4.json')],
6+
['5', require('../../image/mocks/5.json')],
7+
['10', require('../../image/mocks/10.json')],
8+
['11', require('../../image/mocks/11.json')],
9+
['17', require('../../image/mocks/17.json')],
10+
['21', require('../../image/mocks/21.json')],
11+
['22', require('../../image/mocks/22.json')],
12+
['airfoil', require('../../image/mocks/airfoil.json')], // important to keep because it's the only mock with config options
13+
['annotations-autorange', require('../../image/mocks/annotations-autorange.json')],
14+
['axes_enumerated_ticks', require('../../image/mocks/axes_enumerated_ticks.json')],
15+
['axes_visible-false', require('../../image/mocks/axes_visible-false.json')],
16+
['bar_and_histogram', require('../../image/mocks/bar_and_histogram.json')],
17+
['waterfall', require('../../image/mocks/waterfall_profit-loss_2018vs2019_rectangle.json')],
18+
['funnel', require('../../image/mocks/funnel_horizontal_group_basic.json')],
19+
['funnelarea', require('../../image/mocks/funnelarea_title_multiple.json')],
20+
['basic_error_bar', require('../../image/mocks/basic_error_bar.json')],
21+
['binding', require('../../image/mocks/binding.json')],
22+
['cheater_smooth', require('../../image/mocks/cheater_smooth.json')],
23+
['finance_style', require('../../image/mocks/finance_style.json')],
24+
['geo_first', require('../../image/mocks/geo_first.json')],
25+
['indicator_bignumber', require('../../image/mocks/indicator_bignumber.json')],
26+
['image_adventurer', require('../../image/mocks/image_adventurer.json')],
27+
['layout_image', require('../../image/mocks/layout_image.json')],
28+
['layout-colorway', require('../../image/mocks/layout-colorway.json')],
29+
['multicategory', require('../../image/mocks/multicategory.json')],
30+
['polar_categories', require('../../image/mocks/polar_categories.json')],
31+
['polar_direction', require('../../image/mocks/polar_direction.json')],
32+
['polar_wind-rose', require('../../image/mocks/polar_wind-rose.json')],
33+
['range_selector_style', require('../../image/mocks/range_selector_style.json')],
34+
['range_slider_multiple', require('../../image/mocks/range_slider_multiple.json')],
35+
['sankey_energy', require('../../image/mocks/sankey_energy.json')],
36+
['sunburst_coffee', require('../../image/mocks/sunburst_coffee.json')],
37+
['treemap_coffee', require('../../image/mocks/treemap_coffee.json')],
38+
['icicle_coffee', require('../../image/mocks/icicle_coffee.json')],
39+
['parcats_bad-displayindex', require('../../image/mocks/parcats_bad-displayindex.json')],
40+
['scattercarpet', require('../../image/mocks/scattercarpet.json')],
41+
['smith_basic', require('../../image/mocks/smith_basic.json')],
42+
['shapes', require('../../image/mocks/shapes.json')],
43+
['splom_iris', require('../../image/mocks/splom_iris.json')],
44+
['table_wrapped_birds', require('../../image/mocks/table_wrapped_birds.json')],
45+
['ternary_fill', require('../../image/mocks/ternary_fill.json')],
46+
['text_chart_arrays', require('../../image/mocks/text_chart_arrays.json')],
47+
['transforms', require('../../image/mocks/transforms.json')],
48+
['updatemenus', require('../../image/mocks/updatemenus.json')],
49+
['violin_side-by-side', require('../../image/mocks/violin_side-by-side.json')],
50+
['world-cals', require('../../image/mocks/world-cals.json')],
5151
['typed arrays', {
5252
data: [{
5353
x: new Float32Array([1, 2, 3]),
@@ -57,24 +57,24 @@ var svgMockList = [
5757
];
5858

5959
var glMockList = [
60-
['gl2d_heatmapgl', require('@mocks/gl2d_heatmapgl.json')],
61-
['gl2d_line_dash', require('@mocks/gl2d_line_dash.json')],
62-
['gl2d_parcoords_2', require('@mocks/gl2d_parcoords_2.json')],
63-
['gl2d_pointcloud-basic', require('@mocks/gl2d_pointcloud-basic.json')],
64-
['gl3d_annotations', require('@mocks/gl3d_annotations.json')],
65-
['gl3d_set-ranges', require('@mocks/gl3d_set-ranges.json')],
66-
['gl3d_world-cals', require('@mocks/gl3d_world-cals.json')],
67-
['gl3d_cone-autorange', require('@mocks/gl3d_cone-autorange.json')],
68-
['gl3d_streamtube-simple', require('@mocks/gl3d_streamtube-simple.json')],
69-
['glpolar_style', require('@mocks/glpolar_style.json')],
70-
['gl3d_isosurface_multiple-traces', require('@mocks/gl3d_isosurface_multiple-traces.json')],
71-
['gl3d_volume_multiple-traces', require('@mocks/gl3d_volume_multiple-traces.json')]
60+
['gl2d_heatmapgl', require('../../image/mocks/gl2d_heatmapgl.json')],
61+
['gl2d_line_dash', require('../../image/mocks/gl2d_line_dash.json')],
62+
['gl2d_parcoords_2', require('../../image/mocks/gl2d_parcoords_2.json')],
63+
['gl2d_pointcloud-basic', require('../../image/mocks/gl2d_pointcloud-basic.json')],
64+
['gl3d_annotations', require('../../image/mocks/gl3d_annotations.json')],
65+
['gl3d_set-ranges', require('../../image/mocks/gl3d_set-ranges.json')],
66+
['gl3d_world-cals', require('../../image/mocks/gl3d_world-cals.json')],
67+
['gl3d_cone-autorange', require('../../image/mocks/gl3d_cone-autorange.json')],
68+
['gl3d_streamtube-simple', require('../../image/mocks/gl3d_streamtube-simple.json')],
69+
['glpolar_style', require('../../image/mocks/glpolar_style.json')],
70+
['gl3d_isosurface_multiple-traces', require('../../image/mocks/gl3d_isosurface_multiple-traces.json')],
71+
['gl3d_volume_multiple-traces', require('../../image/mocks/gl3d_volume_multiple-traces.json')]
7272
];
7373

7474
var mapboxMockList = [
75-
['scattermapbox', require('@mocks/mapbox_bubbles-text.json')],
76-
['choroplethmapbox', require('@mocks/mapbox_choropleth0.json')],
77-
['densitymapbox', require('@mocks/mapbox_density0.json')]
75+
['scattermapbox', require('../../image/mocks/mapbox_bubbles-text.json')],
76+
['choroplethmapbox', require('../../image/mocks/mapbox_choropleth0.json')],
77+
['densitymapbox', require('../../image/mocks/mapbox_density0.json')]
7878
];
7979

8080
module.exports = {

0 commit comments

Comments
 (0)