Skip to content

Simplify tests by dropping shortcut paths & use main webpack config in karma #6462

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

Merged
merged 3 commits into from
Feb 1, 2023
Merged

Simplify tests by dropping shortcut paths & use main webpack config in karma #6462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f003fc
use identical webpack rules in karma config
archmoj Feb 1, 2023
8b8489c
delete tasks/util/shortcut_paths.js
archmoj Feb 1, 2023
2b31c39
replace shortcut paths in jasmine to real paths
archmoj Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions tasks/util/shortcut_paths.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/jasmine/assets/check_component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ module.exports = function checkComponent(Plotly) {
describe('registered subplot (gl3d)', function() {
var gd;

var mock = require('@mocks/gl3d_world-cals');
var mock = require('../../image/mocks/gl3d_world-cals');
// just pick out the scatter3d trace
mock.data = [mock.data[1]];
var xaxisCalendar = mock.layout.scene.xaxis.calendar;
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/assets/check_event_data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var Plotly = require('@lib/index');
var Plotly = require('../../../lib/index');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var Lib = require('@src/lib');
var Lib = require('../../../src/lib');

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

Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/assets/check_texttemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var Plotly = require('@lib/index');
var Registry = require('@src/registry');
var Plotly = require('../../../lib/index');
var Registry = require('../../../src/registry');

var Lib = require('@src/lib');
var Lib = require('../../../src/lib');
var d3Select = require('../../strict-d3').select;
var d3SelectAll = require('../../strict-d3').selectAll;
var failTest = require('../assets/fail_test');
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/assets/check_transitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var Plotly = require('../../../lib/index');
var Lib = require('../../../src/lib');
var d3Timer = require('../../strict-d3').timer;
var d3Select = require('../../strict-d3').select;
var d3SelectAll = require('../../strict-d3').selectAll;
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/assets/click.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var mouseEvent = require('./mouse_event');
var Lib = require('@src/lib');
var Lib = require('../../../src/lib');

/*
* simulated click event at screen pixel position x, y
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/assets/custom_matchers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
'use strict';

var isNumeric = require('fast-isnumeric');
var isPlainObject = require('@src/lib/is_plain_object');
var extendDeep = require('@src/lib/extend').extendDeep;
var isPlainObject = require('../../../src/lib/is_plain_object');
var extendDeep = require('../../../src/lib/extend').extendDeep;
var deepEqual = require('deep-equal');

var matchers = {
Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/assets/domain_ref_components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
// promise is followed by .then(done, done.fail)
'use strict';

var Plotly = require('@lib/index');
var Plotly = require('../../../lib/index');
var d3Select = require('../../strict-d3').select;
var d3SelectAll = require('../../strict-d3').selectAll;
var pixelCalc = require('../assets/pixel_calc');
var getSVGElemScreenBBox = require('../assets/get_svg_elem_screen_bbox');
// var SVGTools = require('../assets/svg_tools');
var Lib = require('@src/lib');
var Axes = require('@src/plots/cartesian/axes');
var axisIds = require('@src/plots/cartesian/axis_ids');
var Lib = require('../../../src/lib');
var Axes = require('../../../src/plots/cartesian/axes');
var axisIds = require('../../../src/plots/cartesian/axis_ids');
var testImage = 'https://images.plot.ly/language-icons/api-home/js-logo.png';
var iterable = require('extra-iterable');

Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/assets/double_click.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var click = require('./click');
var getNodeCoords = require('./get_node_coords');
var DBLCLICKDELAY = require('@src/plot_api/plot_config').dfltConfig.doubleClickDelay;
var DBLCLICKDELAY = require('../../../src/plot_api/plot_config').dfltConfig.doubleClickDelay;

/*
* Double click on a point.
Expand Down
124 changes: 62 additions & 62 deletions test/jasmine/assets/mock_lists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
// list of mocks that should include *all* plotly.js trace modules

var svgMockList = [
['1', require('@mocks/1.json')],
['4', require('@mocks/4.json')],
['5', require('@mocks/5.json')],
['10', require('@mocks/10.json')],
['11', require('@mocks/11.json')],
['17', require('@mocks/17.json')],
['21', require('@mocks/21.json')],
['22', require('@mocks/22.json')],
['airfoil', require('@mocks/airfoil.json')], // important to keep because it's the only mock with config options
['annotations-autorange', require('@mocks/annotations-autorange.json')],
['axes_enumerated_ticks', require('@mocks/axes_enumerated_ticks.json')],
['axes_visible-false', require('@mocks/axes_visible-false.json')],
['bar_and_histogram', require('@mocks/bar_and_histogram.json')],
['waterfall', require('@mocks/waterfall_profit-loss_2018vs2019_rectangle.json')],
['funnel', require('@mocks/funnel_horizontal_group_basic.json')],
['funnelarea', require('@mocks/funnelarea_title_multiple.json')],
['basic_error_bar', require('@mocks/basic_error_bar.json')],
['binding', require('@mocks/binding.json')],
['cheater_smooth', require('@mocks/cheater_smooth.json')],
['finance_style', require('@mocks/finance_style.json')],
['geo_first', require('@mocks/geo_first.json')],
['indicator_bignumber', require('@mocks/indicator_bignumber.json')],
['image_adventurer', require('@mocks/image_adventurer.json')],
['layout_image', require('@mocks/layout_image.json')],
['layout-colorway', require('@mocks/layout-colorway.json')],
['multicategory', require('@mocks/multicategory.json')],
['polar_categories', require('@mocks/polar_categories.json')],
['polar_direction', require('@mocks/polar_direction.json')],
['polar_wind-rose', require('@mocks/polar_wind-rose.json')],
['range_selector_style', require('@mocks/range_selector_style.json')],
['range_slider_multiple', require('@mocks/range_slider_multiple.json')],
['sankey_energy', require('@mocks/sankey_energy.json')],
['sunburst_coffee', require('@mocks/sunburst_coffee.json')],
['treemap_coffee', require('@mocks/treemap_coffee.json')],
['icicle_coffee', require('@mocks/icicle_coffee.json')],
['parcats_bad-displayindex', require('@mocks/parcats_bad-displayindex.json')],
['scattercarpet', require('@mocks/scattercarpet.json')],
['smith_basic', require('@mocks/smith_basic.json')],
['shapes', require('@mocks/shapes.json')],
['splom_iris', require('@mocks/splom_iris.json')],
['table_wrapped_birds', require('@mocks/table_wrapped_birds.json')],
['ternary_fill', require('@mocks/ternary_fill.json')],
['text_chart_arrays', require('@mocks/text_chart_arrays.json')],
['transforms', require('@mocks/transforms.json')],
['updatemenus', require('@mocks/updatemenus.json')],
['violin_side-by-side', require('@mocks/violin_side-by-side.json')],
['world-cals', require('@mocks/world-cals.json')],
['1', require('../../image/mocks/1.json')],
['4', require('../../image/mocks/4.json')],
['5', require('../../image/mocks/5.json')],
['10', require('../../image/mocks/10.json')],
['11', require('../../image/mocks/11.json')],
['17', require('../../image/mocks/17.json')],
['21', require('../../image/mocks/21.json')],
['22', require('../../image/mocks/22.json')],
['airfoil', require('../../image/mocks/airfoil.json')], // important to keep because it's the only mock with config options
['annotations-autorange', require('../../image/mocks/annotations-autorange.json')],
['axes_enumerated_ticks', require('../../image/mocks/axes_enumerated_ticks.json')],
['axes_visible-false', require('../../image/mocks/axes_visible-false.json')],
['bar_and_histogram', require('../../image/mocks/bar_and_histogram.json')],
['waterfall', require('../../image/mocks/waterfall_profit-loss_2018vs2019_rectangle.json')],
['funnel', require('../../image/mocks/funnel_horizontal_group_basic.json')],
['funnelarea', require('../../image/mocks/funnelarea_title_multiple.json')],
['basic_error_bar', require('../../image/mocks/basic_error_bar.json')],
['binding', require('../../image/mocks/binding.json')],
['cheater_smooth', require('../../image/mocks/cheater_smooth.json')],
['finance_style', require('../../image/mocks/finance_style.json')],
['geo_first', require('../../image/mocks/geo_first.json')],
['indicator_bignumber', require('../../image/mocks/indicator_bignumber.json')],
['image_adventurer', require('../../image/mocks/image_adventurer.json')],
['layout_image', require('../../image/mocks/layout_image.json')],
['layout-colorway', require('../../image/mocks/layout-colorway.json')],
['multicategory', require('../../image/mocks/multicategory.json')],
['polar_categories', require('../../image/mocks/polar_categories.json')],
['polar_direction', require('../../image/mocks/polar_direction.json')],
['polar_wind-rose', require('../../image/mocks/polar_wind-rose.json')],
['range_selector_style', require('../../image/mocks/range_selector_style.json')],
['range_slider_multiple', require('../../image/mocks/range_slider_multiple.json')],
['sankey_energy', require('../../image/mocks/sankey_energy.json')],
['sunburst_coffee', require('../../image/mocks/sunburst_coffee.json')],
['treemap_coffee', require('../../image/mocks/treemap_coffee.json')],
['icicle_coffee', require('../../image/mocks/icicle_coffee.json')],
['parcats_bad-displayindex', require('../../image/mocks/parcats_bad-displayindex.json')],
['scattercarpet', require('../../image/mocks/scattercarpet.json')],
['smith_basic', require('../../image/mocks/smith_basic.json')],
['shapes', require('../../image/mocks/shapes.json')],
['splom_iris', require('../../image/mocks/splom_iris.json')],
['table_wrapped_birds', require('../../image/mocks/table_wrapped_birds.json')],
['ternary_fill', require('../../image/mocks/ternary_fill.json')],
['text_chart_arrays', require('../../image/mocks/text_chart_arrays.json')],
['transforms', require('../../image/mocks/transforms.json')],
['updatemenus', require('../../image/mocks/updatemenus.json')],
['violin_side-by-side', require('../../image/mocks/violin_side-by-side.json')],
['world-cals', require('../../image/mocks/world-cals.json')],
['typed arrays', {
data: [{
x: new Float32Array([1, 2, 3]),
Expand All @@ -57,24 +57,24 @@ var svgMockList = [
];

var glMockList = [
['gl2d_heatmapgl', require('@mocks/gl2d_heatmapgl.json')],
['gl2d_line_dash', require('@mocks/gl2d_line_dash.json')],
['gl2d_parcoords_2', require('@mocks/gl2d_parcoords_2.json')],
['gl2d_pointcloud-basic', require('@mocks/gl2d_pointcloud-basic.json')],
['gl3d_annotations', require('@mocks/gl3d_annotations.json')],
['gl3d_set-ranges', require('@mocks/gl3d_set-ranges.json')],
['gl3d_world-cals', require('@mocks/gl3d_world-cals.json')],
['gl3d_cone-autorange', require('@mocks/gl3d_cone-autorange.json')],
['gl3d_streamtube-simple', require('@mocks/gl3d_streamtube-simple.json')],
['glpolar_style', require('@mocks/glpolar_style.json')],
['gl3d_isosurface_multiple-traces', require('@mocks/gl3d_isosurface_multiple-traces.json')],
['gl3d_volume_multiple-traces', require('@mocks/gl3d_volume_multiple-traces.json')]
['gl2d_heatmapgl', require('../../image/mocks/gl2d_heatmapgl.json')],
['gl2d_line_dash', require('../../image/mocks/gl2d_line_dash.json')],
['gl2d_parcoords_2', require('../../image/mocks/gl2d_parcoords_2.json')],
['gl2d_pointcloud-basic', require('../../image/mocks/gl2d_pointcloud-basic.json')],
['gl3d_annotations', require('../../image/mocks/gl3d_annotations.json')],
['gl3d_set-ranges', require('../../image/mocks/gl3d_set-ranges.json')],
['gl3d_world-cals', require('../../image/mocks/gl3d_world-cals.json')],
['gl3d_cone-autorange', require('../../image/mocks/gl3d_cone-autorange.json')],
['gl3d_streamtube-simple', require('../../image/mocks/gl3d_streamtube-simple.json')],
['glpolar_style', require('../../image/mocks/glpolar_style.json')],
['gl3d_isosurface_multiple-traces', require('../../image/mocks/gl3d_isosurface_multiple-traces.json')],
['gl3d_volume_multiple-traces', require('../../image/mocks/gl3d_volume_multiple-traces.json')]
];

var mapboxMockList = [
['scattermapbox', require('@mocks/mapbox_bubbles-text.json')],
['choroplethmapbox', require('@mocks/mapbox_choropleth0.json')],
['densitymapbox', require('@mocks/mapbox_density0.json')]
['scattermapbox', require('../../image/mocks/mapbox_bubbles-text.json')],
['choroplethmapbox', require('../../image/mocks/mapbox_choropleth0.json')],
['densitymapbox', require('../../image/mocks/mapbox_density0.json')]
];

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/assets/modebar_button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var d3Select = require('../../strict-d3').select;
var modeBarButtons = require('@src/components/modebar/buttons');
var modeBarButtons = require('../../../src/components/modebar/buttons');

module.exports = function selectButton(modeBar, name) {
var button = {};
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/assets/mouse_event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Lib = require('@src/lib');
var Lib = require('../../../src/lib');

module.exports = function(type, x, y, opts) {
var visibility = document.visibilityState;
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/assets/supply_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

var Plots = require('@src/plots/plots');
var Plots = require('../../../src/plots/plots');

// The following is used to fill up the Registry module
/* eslint-disable-next-line */
var Plotly = require('@lib/index');
var Plotly = require('../../../lib/index');

/**
* supplyDefaults that fills in necessary _context
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/assets/touch_event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Lib = require('@src/lib');
var Lib = require('../../../src/lib');

module.exports = function(type, x, y, opts) {
var el = (opts && opts.element) || document.elementFromPoint(x, y);
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/bundle_tests/bar_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var d3SelectAll = require('../../strict-d3').selectAll;

var Plotly = require('@lib/core');
var PlotlyBar = require('@lib/bar');
var Plotly = require('../../../lib/core');
var PlotlyBar = require('../../../lib/bar');

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
Expand All @@ -12,7 +12,7 @@ describe('Bundle with bar', function() {

Plotly.register(PlotlyBar);

var mock = require('@mocks/bar_line.json');
var mock = require('../../image/mocks/bar_line.json');

beforeEach(function(done) {
Plotly.newPlot(createGraphDiv(), mock.data, mock.layout).then(done);
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/bundle_tests/choropleth_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var d3SelectAll = require('../../strict-d3').selectAll;

var Plotly = require('@lib/core');
var PlotlyChoropleth = require('@lib/choropleth');
var Plotly = require('../../../lib/core');
var PlotlyChoropleth = require('../../../lib/choropleth');

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
Expand All @@ -17,7 +17,7 @@ describe('Bundle with choropleth', function() {

var gd;

var mock = require('@mocks/geo_multiple-usa-choropleths.json');
var mock = require('../../image/mocks/geo_multiple-usa-choropleths.json');

beforeEach(function() {
gd = createGraphDiv();
Expand Down
10 changes: 5 additions & 5 deletions test/jasmine/bundle_tests/component_first_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var Plotly = require('@lib/core');
var Bar = require('@lib/bar');
var Scatter3d = require('@lib/scatter3d');
var Filter = require('@lib/filter');
var Calendars = require('@lib/calendars');
var Plotly = require('../../../lib/core');
var Bar = require('../../../lib/bar');
var Scatter3d = require('../../../lib/scatter3d');
var Filter = require('../../../lib/filter');
var Calendars = require('../../../lib/calendars');

var checkComponent = require('../assets/check_component');

Expand Down
10 changes: 5 additions & 5 deletions test/jasmine/bundle_tests/component_last_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var Plotly = require('@lib/core');
var Bar = require('@lib/bar');
var Scatter3d = require('@lib/scatter3d');
var Filter = require('@lib/filter');
var Calendars = require('@lib/calendars');
var Plotly = require('../../../lib/core');
var Bar = require('../../../lib/bar');
var Scatter3d = require('../../../lib/scatter3d');
var Filter = require('../../../lib/filter');
var Calendars = require('../../../lib/calendars');

var checkComponent = require('../assets/check_component');

Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/bundle_tests/contour_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var d3SelectAll = require('../../strict-d3').selectAll;

var Plotly = require('@lib/core');
var PlotlyContour = require('@lib/contour');
var Plotly = require('../../../lib/core');
var PlotlyContour = require('../../../lib/contour');

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
Expand All @@ -12,7 +12,7 @@ describe('Bundle with contour', function() {

Plotly.register(PlotlyContour);

var mock = require('@mocks/contour_scatter.json');
var mock = require('../../image/mocks/contour_scatter.json');

beforeEach(function(done) {
Plotly.newPlot(createGraphDiv(), mock.data, mock.layout).then(done);
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/bundle_tests/core_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var d3SelectAll = require('../../strict-d3').selectAll;

var Plotly = require('@lib/core');
var Plotly = require('../../../lib/core');

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
Expand All @@ -10,7 +10,7 @@ describe('Bundle with core only', function() {
'use strict';
var gd;

var mock = require('@mocks/bar_line.json');
var mock = require('../../image/mocks/bar_line.json');

beforeEach(function(done) {
gd = createGraphDiv();
Expand Down
Loading