diff --git a/CHANGELOG.md b/CHANGELOG.md index cb1e43122..ef9cf4c68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,16 @@ - Fix invalid read/write when animation is contiguous (onFinish callback calls setKeyframe). - Waterfall chart preset not aligned. -- Split chart count negative values too. +- Split chart count negative values too. + +### Changed + +- Separate Channel properties to AxisChannel properties at config. +- Channels 'set' rewrite doesn't clear AxisChannel properties. + +### Added + +- Enable split and align on mainAxis. ## [0.16.0] - 2024-11-28 diff --git a/docs/tutorial/align_range/01.js b/docs/tutorial/align_range/01.js index c5c4e4813..e6c63696a 100644 --- a/docs/tutorial/align_range/01.js +++ b/docs/tutorial/align_range/01.js @@ -1,8 +1,8 @@ chart.animate({ config: { - align: 'center', channels: { y: { + align: 'center', labels: false } } diff --git a/docs/tutorial/align_range/02_b.js b/docs/tutorial/align_range/02_b.js index aa3591dfd..726e022f7 100644 --- a/docs/tutorial/align_range/02_b.js +++ b/docs/tutorial/align_range/02_b.js @@ -1,10 +1,8 @@ chart.animate({ config: { - align: 'stretch', - channels: { - y: { - labels: true - } + y: { + align: 'stretch', + labels: true } } }) diff --git a/docs/tutorial/align_range/03_b.js b/docs/tutorial/align_range/03_b.js index 6166c47b9..93aab92c3 100644 --- a/docs/tutorial/align_range/03_b.js +++ b/docs/tutorial/align_range/03_b.js @@ -1,5 +1,7 @@ chart.animate({ config: { - align: 'none' + y: { + align: 'none' + } } }) diff --git a/docs/tutorial/orientation_split_polar/02_b.js b/docs/tutorial/orientation_split_polar/02_b.js index d5d2f52a5..06458db84 100644 --- a/docs/tutorial/orientation_split_polar/02_b.js +++ b/docs/tutorial/orientation_split_polar/02_b.js @@ -1,5 +1,5 @@ chart.animate({ config: { - split: true + x: { split: true } } }) diff --git a/docs/tutorial/orientation_split_polar/03_b.js b/docs/tutorial/orientation_split_polar/03_b.js index b190b1e34..9f6c547ec 100644 --- a/docs/tutorial/orientation_split_polar/03_b.js +++ b/docs/tutorial/orientation_split_polar/03_b.js @@ -1,5 +1,5 @@ chart.animate({ config: { - split: false + x: { split: false } } }) diff --git a/docs/tutorial/shorthands_store/01.js b/docs/tutorial/shorthands_store/01.js index 3f3a505c6..6d6ac54b1 100644 --- a/docs/tutorial/shorthands_store/01.js +++ b/docs/tutorial/shorthands_store/01.js @@ -1,5 +1,7 @@ chart.animate({ // config: { - align: 'stretch' + y: { + align: 'stretch' + } // } }) diff --git a/docs/tutorial/shorthands_store/03_b.js b/docs/tutorial/shorthands_store/03_b.js index 9f813eaff..a36c9da1d 100644 --- a/docs/tutorial/shorthands_store/03_b.js +++ b/docs/tutorial/shorthands_store/03_b.js @@ -9,10 +9,10 @@ chart }, // y: { detach: [ 'Kinds' ] }, y: { - detach: 'Kinds' + detach: 'Kinds', + align: 'none' } - }, - align: 'none' + } }) .activated.then((control) => { animation = control.store() diff --git a/docs/tutorial/shorthands_store/08.js b/docs/tutorial/shorthands_store/08.js index 3d7435735..44cfa11f1 100644 --- a/docs/tutorial/shorthands_store/08.js +++ b/docs/tutorial/shorthands_store/08.js @@ -3,9 +3,12 @@ chart.animate( style: null, config: { title: 'Store function', - align: 'stretch', + channels: { - y: ['Popularity', 'Kinds'], + y: { + set: ['Popularity', 'Kinds'], + align: 'stretch' + }, x: ['Genres'], label: ['Popularity'] }, diff --git a/docs/tutorial/shorthands_store/09.js b/docs/tutorial/shorthands_store/09.js index ad162bab8..d55a51ede 100644 --- a/docs/tutorial/shorthands_store/09.js +++ b/docs/tutorial/shorthands_store/09.js @@ -2,9 +2,11 @@ chart.animate({ style: null, config: { title: 'Store function', - align: 'stretch', channels: { - y: ['Popularity', 'Kinds'], + y: { + set: ['Popularity', 'Kinds'], + align: 'stretch' + }, x: ['Genres'], label: ['Popularity'] }, diff --git a/docs/tutorial/sorting/01.js b/docs/tutorial/sorting/01.js index 73ed51884..ebc60dc95 100644 --- a/docs/tutorial/sorting/01.js +++ b/docs/tutorial/sorting/01.js @@ -1,5 +1,5 @@ chart.animate({ config: { - sort: 'byValue' + x: { sort: 'byValue' } } }) diff --git a/docs/tutorial/sorting/02_b.js b/docs/tutorial/sorting/02_b.js index 2e0b46120..4f306b9d3 100644 --- a/docs/tutorial/sorting/02_b.js +++ b/docs/tutorial/sorting/02_b.js @@ -1,5 +1,5 @@ chart.animate({ config: { - reverse: true + x: { reverse: true } } }) diff --git a/docs/tutorial/sorting/03_b.js b/docs/tutorial/sorting/03_b.js index 87913115d..0dab8f151 100644 --- a/docs/tutorial/sorting/03_b.js +++ b/docs/tutorial/sorting/03_b.js @@ -1,6 +1,8 @@ chart.animate({ config: { - sort: 'none', - reverse: false + x: { + sort: 'none', + reverse: false + } } }) diff --git a/src/apps/weblib/ts-api/plugins/presetconfigs.js b/src/apps/weblib/ts-api/plugins/presetconfigs.js index 9786fcaa3..4c8e6bf7d 100644 --- a/src/apps/weblib/ts-api/plugins/presetconfigs.js +++ b/src/apps/weblib/ts-api/plugins/presetconfigs.js @@ -25,20 +25,18 @@ export const presetConfigs = { splittedColumn: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'splittedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'splittedBy' }], split: true }, color: { set: [{ name: 'splittedBy' }] }, label: { set: [{ name: 'y' }] } - }, - split: true + } }, percentageColumn: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'stackedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'stackedBy' }], align: 'stretch' }, color: { set: [{ name: 'stackedBy' }] }, label: { set: [{ name: 'y' }] } - }, - align: 'stretch' + } }, waterfall: { channels: { @@ -59,11 +57,10 @@ export const presetConfigs = { marimekko: { channels: { x: { set: [{ name: 'x' }, { name: 'groupedBy' }] }, - y: { set: [{ name: 'y' }, { name: 'stackedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'stackedBy' }], align: 'stretch' }, color: { set: [{ name: 'stackedBy' }] }, label: { set: [{ name: 'x' }] } - }, - align: 'stretch' + } }, bar: { channels: { @@ -90,21 +87,19 @@ export const presetConfigs = { }, splittedBar: { channels: { - x: { set: [{ name: 'x' }, { name: 'splittedBy' }] }, + x: { set: [{ name: 'x' }, { name: 'splittedBy' }], split: true }, y: { set: [{ name: 'y' }] }, color: { set: [{ name: 'splittedBy' }] }, label: { set: [{ name: 'x' }] } - }, - split: true + } }, percentageBar: { channels: { - x: { set: [{ name: 'x' }, { name: 'stackedBy' }] }, + x: { set: [{ name: 'x' }, { name: 'stackedBy' }], align: 'stretch' }, y: { set: [{ name: 'y' }] }, color: { set: [{ name: 'stackedBy' }] }, label: { set: [{ name: 'x' }] } - }, - align: 'stretch' + } }, lollipop: { channels: { @@ -151,58 +146,50 @@ export const presetConfigs = { percentageArea: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'stackedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'stackedBy' }], align: 'stretch' }, color: { set: [{ name: 'stackedBy' }] } }, - align: 'stretch', geometry: 'area' }, splittedArea: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'splittedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'splittedBy' }], split: true }, color: { set: [{ name: 'splittedBy' }] } }, - split: true, geometry: 'area' }, stream: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'stackedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'stackedBy' }], align: 'center' }, color: { set: [{ name: 'stackedBy' }] } }, - geometry: 'area', - align: 'center' + geometry: 'area' }, verticalStream: { channels: { - x: { set: [{ name: 'x' }, { name: 'stackedBy' }] }, + x: { set: [{ name: 'x' }, { name: 'stackedBy' }], align: 'center' }, y: { set: [{ name: 'y' }] }, color: { set: [{ name: 'stackedBy' }] } }, - geometry: 'area', - align: 'center' + geometry: 'area' }, violin: { channels: { x: { set: [{ name: 'x' }] }, - y: { set: [{ name: 'y' }, { name: 'splittedBy' }] }, + y: { set: [{ name: 'y' }, { name: 'splittedBy' }], align: 'center', split: true }, color: { set: [{ name: 'splittedBy' }] } }, - geometry: 'area', - align: 'center', - split: true + geometry: 'area' }, verticalViolin: { channels: { - x: { set: [{ name: 'x' }, { name: 'splittedBy' }] }, + x: { set: [{ name: 'x' }, { name: 'splittedBy' }], align: 'center', split: true }, y: { set: [{ name: 'y' }] }, color: { set: [{ name: 'splittedBy' }] } }, - geometry: 'area', - align: 'center', - split: true + geometry: 'area' }, line: { channels: { @@ -280,13 +267,12 @@ export const presetConfigs = { }, nestedDonut: { channels: { - x: { set: [{ name: 'angle' }, { name: 'stackedBy' }] }, + x: { set: [{ name: 'angle' }, { name: 'stackedBy' }], align: 'stretch' }, y: { set: [{ name: 'radius' }], range: { min: '-50%' } }, color: { set: [{ name: 'stackedBy' }] }, label: { set: [{ name: 'angle' }] } }, - coordSystem: 'polar', - align: 'stretch' + coordSystem: 'polar' }, polarScatter: { channels: { diff --git a/src/apps/weblib/ts-api/plugins/presets.ts b/src/apps/weblib/ts-api/plugins/presets.ts index 03280f882..35643352a 100644 --- a/src/apps/weblib/ts-api/plugins/presets.ts +++ b/src/apps/weblib/ts-api/plugins/presets.ts @@ -31,20 +31,81 @@ export default class Presets { private _nullConfig(): Config.Chart { return { - align: 'none', + /* + title: null, + subtitle: null, + caption: null, + legend: 'auto', + */ coordSystem: 'cartesian', orientation: 'auto', angle: 0, - split: false, geometry: 'rectangle', channels: { - x: { set: null }, - y: { set: null }, - color: { set: null }, - lightness: { set: null }, - size: { set: null }, - noop: { set: null }, - label: { set: null } + x: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto', + axis: 'auto', + labels: 'auto', + ticks: 'auto', + interlacing: 'auto', + guides: 'auto', + markerGuides: 'auto', + step: 'auto', + // sort: 'none', + // reverse: false, + align: 'none', + split: false + }, + y: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto', + axis: 'auto', + labels: 'auto', + ticks: 'auto', + interlacing: 'auto', + guides: 'auto', + markerGuides: 'auto', + step: 'auto', + // sort: 'none', + // reverse: false, + align: 'none', + split: false + }, + color: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto' + }, + lightness: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto' + }, + size: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto' + }, + noop: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto' + }, + label: { + set: null, + title: 'auto', + // range: { min: 'auto', max: 'auto' }, + labelLevel: 'auto' + } } } } @@ -102,17 +163,43 @@ export default class Presets { } } - private _setupUserParams(base: Config.Chart, config: Config.Chart): void { - ;['legend', 'title', 'subtitle', 'caption', 'reverse', 'sort'].forEach((key) => { + private _setupUserParams( + base: Config.Chart, + config: Config.Chart, + mainAxis: keyof Config.Channels + ): void { + ;['legend', 'title', 'subtitle', 'caption'].forEach((key) => { const prop = key as keyof Config.Chart this._assignProperty(base, config, prop) }) + ;['reverse', 'sort'].forEach((key) => { + this._assignProperty( + base.channels?.[mainAxis] as Config.Channel, + config as Config.Channel, + key as keyof Config.Channel + ) + }) + } + + private _getMainAxis(presetConfig: Config.Chart): keyof Config.Channels { + const channel = presetConfig.channels?.x + if ( + this._isChannel(channel) && + channel.set?.find((series) => { + return series.name === 'stackedBy' || series.name === 'splittedBy' + }) + ) { + return 'y' as keyof Config.Channels + } + + return 'x' as keyof Config.Channels } private _buildPresetConfig(presetName: PresetNames, config: Config.Chart): Config.Chart { const presetConfig = this._createPresetConfig(presetName) + const mainAxis = this._getMainAxis(presetConfig) this._fillChannels(presetConfig, config) - this._setupUserParams(presetConfig, config) + this._setupUserParams(presetConfig, config, mainAxis) return presetConfig } } diff --git a/src/apps/weblib/typeschema-api/config.yaml b/src/apps/weblib/typeschema-api/config.yaml index e9eb039f8..03e9ebcc3 100644 --- a/src/apps/weblib/typeschema-api/config.yaml +++ b/src/apps/weblib/typeschema-api/config.yaml @@ -76,6 +76,12 @@ definitions: oneOf: - type: number - { type: string, enum: [auto] } + + AxisChannel: + description: | + AxisChannels are special channel settings for the positional channels. + type: object + properties: axis: description: Enables the axis line on axis channels. $ref: AutoBool @@ -102,6 +108,26 @@ definitions: oneOf: - type: number - { type: string, enum: [auto] } + sort: + description: | + - 'none': markers are sorted in the order as the corresponding data + appear in the data set. + - 'byValue': markers will be sorted by the corresponding measure (if present) + in decreasing order. + type: string + enum: [none, byValue] + reverse: + description: Reverts the order of the markers if set. + type: boolean + align: + description: | + Sets the alignment of the markers along the axis. + type: string + enum: [none, center, stretch] + split: + description: | + If set to true, markers will be split by the dimension(s) along the axis. + type: boolean Channels: description: | @@ -109,14 +135,18 @@ definitions: type: object properties: x: - $ref: Channel + allOf: + - $ref: Channel + - $ref: AxisChannel description: | Parameters for the X-axis, determining the position of the markers on the x-axis - or their angle when using polar coordinates. Note: leaving x and y channels empty will result in a chart "without coordinates" like a Treemap or a Bubble Chart. y: - $ref: Channel + allOf: + - $ref: Channel + - $ref: AxisChannel description: | Parameters for the Y-axis, determining the position of the markers on the y-axis - or their radius when using polar coordinates) . @@ -208,31 +238,6 @@ definitions: are oriented to. type: string enum: [auto, horizontal, vertical] - sort: - description: | - - 'none': markers are sorted in the order as the corresponding data - appear in the data set. - - 'byValue': markers will be sorted by the corresponding measure (if present) - in decreasing order. - type: string - enum: [none, byValue] - reverse: - description: Reverts the order of the markers if set. - type: boolean - align: - description: | - Sets the alignment of the markers with relation to the x- or the y-axis depending - on where the measure is. In case both axes have measures on them, this is determined - by the `orientation` of the chart. - type: string - enum: [none, center, stretch] - split: - description: | - If set to true, markers will be split by the dimension(s) along the axis. - This works if you have at least one dimension and a measure on the same axis.In case - both axes have measures and dimension(s) on them, this is determined by the - `orientation` of the chart. - type: boolean tooltip: description: | Unique identifier of the marker, the tooltip should be turned on. This parameter is diff --git a/src/chart/generator/guides.cpp b/src/chart/generator/guides.cpp index 86f9abce3..f1edff5a0 100644 --- a/src/chart/generator/guides.cpp +++ b/src/chart/generator/guides.cpp @@ -20,9 +20,9 @@ bool GuidesByAxis::operator==(const GuidesByAxis &other) const Guides::Guides(const Options &options) { - const auto &xOpt = options.getChannels().at(AxisId::x); - const auto &yOpt = options.getChannels().at(AxisId::y); - if (xOpt.isEmpty() && yOpt.isEmpty()) return; + const auto &xChannel = options.getChannels().at(AxisId::x); + const auto &yChannel = options.getChannels().at(AxisId::y); + if (xChannel.isEmpty() && yChannel.isEmpty()) return; auto xIsMeasure = options.isMeasure(ChannelId::x); auto yIsMeasure = options.isMeasure(ChannelId::y); @@ -30,6 +30,9 @@ Guides::Guides(const Options &options) auto isCircle = options.geometry.get() == ShapeType::circle; auto isHorizontal = options.isHorizontal(); + const auto &xOpt = options.getChannels().axisPropsAt(AxisId::x); + const auto &yOpt = options.getChannels().axisPropsAt(AxisId::y); + x.axis = xOpt.axis.getValue(yIsMeasure); y.axis = yOpt.axis.getValue(xIsMeasure && !isPolar); @@ -58,16 +61,17 @@ Guides::Guides(const Options &options) x.labels = xOpt.labels.getValue( (!isPolar || yIsMeasure) && ((xIsMeasure && (x.axisSticks || x.interlacings)) - || (!xIsMeasure && !xOpt.isEmpty()))); + || (!xIsMeasure && !xChannel.isEmpty()))); auto stretchedPolar = isPolar && !yIsMeasure - && (options.align == Base::Align::Type::stretch); + && (options.getChannels().axisPropsAt(AxisId::x).align + == Base::Align::Type::stretch); y.labels = yOpt.labels.getValue( !stretchedPolar && ((yIsMeasure && (y.axisSticks || y.interlacings)) - || (!yIsMeasure && !yOpt.isEmpty()))); + || (!yIsMeasure && !yChannel.isEmpty()))); } GuidesByAxis &Guides::at(AxisId channel) diff --git a/src/chart/generator/marker.cpp b/src/chart/generator/marker.cpp index 87047be9c..90523d3b2 100644 --- a/src/chart/generator/marker.cpp +++ b/src/chart/generator/marker.cpp @@ -96,10 +96,11 @@ Marker::Marker(const Options &options, index, horizontal ? mainId : subId); - auto yChannelRectDim = - !yHasMeas && channels.at(AxisId::y).hasDimension() - && options.geometry == ShapeType::rectangle - && options.align != Base::Align::Type::stretch; + auto yChannelRectDim = !yHasMeas + && channels.at(AxisId::y).hasDimension() + && options.geometry == ShapeType::rectangle + && channels.axisPropsAt(AxisId::y).align + != Base::Align::Type::stretch; spacing.x = (horizontal || (lineOrCircle && !polar) || yChannelRectDim) @@ -114,10 +115,11 @@ Marker::Marker(const Options &options, index, !horizontal ? mainId : subId); - auto xChannelRectDim = - !xHasMeas && channels.at(AxisId::x).hasDimension() - && options.geometry == ShapeType::rectangle - && options.align != Base::Align::Type::stretch; + auto xChannelRectDim = !xHasMeas + && channels.at(AxisId::x).hasDimension() + && options.geometry == ShapeType::rectangle + && channels.axisPropsAt(AxisId::x).align + != Base::Align::Type::stretch; spacing.y = (!horizontal || lineOrCircle || xChannelRectDim) && options.getChannels().anyAxisSet() diff --git a/src/chart/generator/plotbuilder.cpp b/src/chart/generator/plotbuilder.cpp index 97f33988a..e55cb09aa 100644 --- a/src/chart/generator/plotbuilder.cpp +++ b/src/chart/generator/plotbuilder.cpp @@ -47,29 +47,35 @@ PlotBuilder::PlotBuilder(const Data::DataTable &dataTable, initDimensionTrackers(); std::size_t mainBucketSize{}; - auto &&subBuckets = generateMarkers(mainBucketSize); + std::size_t subBucketSize{}; + auto &&buckets = generateMarkers(mainBucketSize, subBucketSize); if (!plot->getOptions()->getChannels().anyAxisSet()) { - addSpecLayout(subBuckets); + addSpecLayout(buckets); normalizeSizes(); } else { normalizeSizes(); - addAxisLayout(subBuckets, mainBucketSize, dataTable); + addAxisLayout(buckets, + mainBucketSize, + subBucketSize, + dataTable); } normalizeColors(); calcLegendAndLabel(dataTable); } -void PlotBuilder::addAxisLayout(Buckets &subBuckets, +void PlotBuilder::addAxisLayout(Buckets &buckets, const std::size_t &mainBucketSize, + const std::size_t &subBucketSize, const Data::DataTable &dataTable) { - linkMarkers(subBuckets); - addSeparation(subBuckets, mainBucketSize); + linkMarkers(buckets, mainBucketSize, subBucketSize); calcAxises(dataTable); - addAlignment(subBuckets); + addAlignment(buckets, plot->getOptions()->subAxisType()); + addAlignment(buckets.sort(&Marker::mainId), + plot->getOptions()->mainAxisType()); } void PlotBuilder::initDimensionTrackers() @@ -81,7 +87,8 @@ void PlotBuilder::initDimensionTrackers() dataCube.combinedSizeOf(ch.dimensions()).second); } -Buckets PlotBuilder::generateMarkers(std::size_t &mainBucketSize) +Buckets PlotBuilder::generateMarkers(std::size_t &mainBucketSize, + std::size_t &subBucketSize) { const auto &mainIds(plot->getOptions()->mainAxis().dimensions()); auto subIds(plot->getOptions()->subAxis().dimensions()); @@ -90,6 +97,7 @@ Buckets PlotBuilder::generateMarkers(std::size_t &mainBucketSize) subIds.split_by(mainIds); mainBucketSize = dataCube.combinedSizeOf(mainIds).first; + subBucketSize = dataCube.combinedSizeOf(subIds).first; plot->markers.reserve(dataCube.df->get_record_count()); } @@ -119,8 +127,9 @@ Buckets PlotBuilder::generateMarkers(std::size_t &mainBucketSize) return Buckets{plot->markers}; } -std::vector -PlotBuilder::sortedBuckets(const Buckets &buckets, bool main) const +std::vector PlotBuilder::sortedBuckets( + const Buckets &buckets, + AxisId axisIndex) const { std::vector sorted; @@ -140,14 +149,18 @@ PlotBuilder::sortedBuckets(const Buckets &buckets, bool main) const !plot->getOptions()->getOrientation()); } - if (main && plot->getOptions()->sort == Sort::byValue) + if (plot->getOptions()->getChannels().axisPropsAt(axisIndex).sort + == Sort::byValue) std::ranges::stable_sort(sorted, [](const BucketInfo &lhs, const BucketInfo &rhs) { return Math::Floating::less(lhs.size, rhs.size); }); - if (main && plot->getOptions()->reverse) + if (plot->getOptions() + ->getChannels() + .axisPropsAt(axisIndex) + .reverse) std::reverse(sorted.begin(), sorted.end()); return sorted; @@ -174,13 +187,21 @@ void PlotBuilder::addSpecLayout(Buckets &buckets) } } -void PlotBuilder::linkMarkers(Buckets &buckets) +void PlotBuilder::linkMarkers(Buckets &buckets, + const std::size_t &mainBucketSize, + const std::size_t &subBucketSize) { auto &&hasMarkerConnection = linkMarkers(buckets.sort(&Marker::mainId), plot->getOptions()->mainAxisType()); + addSeparation(buckets, + plot->getOptions()->mainAxisType(), + subBucketSize); std::ignore = linkMarkers(buckets.sort(&Marker::subId), plot->getOptions()->subAxisType()); + addSeparation(buckets, + plot->getOptions()->subAxisType(), + mainBucketSize); if (hasMarkerConnection && plot->getOptions()->geometry.get() == ShapeType::line @@ -201,7 +222,7 @@ bool PlotBuilder::linkMarkers(const Buckets &buckets, AxisId axisIndex) const { auto isMain = axisIndex == plot->getOptions()->mainAxisType(); - auto &&sorted = sortedBuckets(buckets, isMain); + auto &&sorted = sortedBuckets(buckets, axisIndex); std::vector dimOffset(sorted.size(), std::numeric_limits::lowest()); @@ -358,7 +379,7 @@ void PlotBuilder::calcLegendAndLabel(const Data::DataTable &dataTable) calcLegend.measure = {std::get<0>(stats.at(type)), meas->getColIndex(), dataTable.getUnit(meas->getColIndex()), - scale.step.getValue()}; + {1}}; } } else if (!scale.isEmpty()) { @@ -409,6 +430,9 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable, const auto &scale = plot->getOptions()->getChannels().at(type); if (scale.isEmpty()) return; + auto &axisProps = + plot->getOptions()->getChannels().axisPropsAt(type); + auto &axis = plot->axises.at(type); auto isAutoTitle = scale.title.isAuto(); @@ -419,23 +443,22 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable, if (isAutoTitle) axis.title = dataCube.getName(meas); if (type == plot->getOptions()->subAxisType() - && plot->getOptions()->align - == Base::Align::Type::stretch) + && axisProps.align == Base::Align::Type::stretch) axis.measure = {{0, 100}, meas.getColIndex(), "%", - scale.step.getValue()}; + axisProps.step.getValue()}; else axis.measure = {std::get<0>(stats.at(type)), meas.getColIndex(), dataTable.getUnit(meas.getColIndex()), - scale.step.getValue()}; + axisProps.step.getValue()}; } else { for (auto merge = plot->getOptions()->dimLabelIndex(+type) == 0 && (type != plot->getOptions()->mainAxisType() - || plot->getOptions()->sort != Sort::byValue + || axisProps.sort != Sort::byValue || scale.dimensions().size() == 1); const auto &marker : plot->markers) { if (!marker.enabled) continue; @@ -454,7 +477,7 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable, merge); } if (auto &&series = plot->getOptions()->labelSeries(type); - !axis.dimension.setLabels(scale.step.getValue(1.0)) + !axis.dimension.setLabels(axisProps.step.getValue(1.0)) && series && isAutoTitle) axis.title = series.value().getColIndex(); for (std::uint32_t pos{}; @@ -464,60 +487,62 @@ void PlotBuilder::calcAxis(const Data::DataTable &dataTable, } } -void PlotBuilder::addAlignment(const Buckets &subBuckets) const +void PlotBuilder::addAlignment(const Buckets &buckets, + AxisId axisIndex) const { - if (plot->getOptions()->isSplit()) return; + if (plot->getOptions()->isSplit(axisIndex)) return; - auto &subAxisRange = - plot->axises.at(plot->getOptions()->subAxisType()) - .measure.range; - if (std::signbit(subAxisRange.min) - || std::signbit(subAxisRange.max)) + auto &axisRange = plot->axises.at(axisIndex).measure.range; + if (std::signbit(axisRange.min) || std::signbit(axisRange.max)) return; - if (plot->getOptions()->align == Base::Align::Type::none) return; + const auto &axisProps = + plot->getOptions()->getChannels().axisPropsAt(axisIndex); - if (plot->getOptions()->align == Base::Align::Type::center) { - auto &&halfSize = subAxisRange.size() / 2.0; + if (axisProps.align == Base::Align::Type::none) return; + + if (axisProps.align == Base::Align::Type::center) { + auto &&halfSize = axisRange.size() / 2.0; if (!Math::Floating::is_zero(halfSize)) - subAxisRange = {subAxisRange.min - halfSize, - subAxisRange.max - halfSize}; + axisRange = {axisRange.min - halfSize, + axisRange.max - halfSize}; } - auto &&subAxis = plot->getOptions()->subAxisType(); - const Base::Align align{plot->getOptions()->align, {0.0, 1.0}}; - for (auto &&bucket : subBuckets) { + const Base::Align align{axisProps.align, {0.0, 1.0}}; + for (auto &&bucket : buckets) { Math::Range<> range; for (auto &&[marker, idx] : bucket) if (marker.enabled) - range.include(marker.getSizeBy(subAxis)); + range.include(marker.getSizeBy(axisIndex)); auto &&transform = align.getAligned(range) / range; for (auto &&[marker, idx] : bucket) - marker.setSizeBy(subAxis, - marker.getSizeBy(subAxis) * transform); + marker.setSizeBy(axisIndex, + marker.getSizeBy(axisIndex) * transform); } } -void PlotBuilder::addSeparation(const Buckets &subBuckets, - const std::size_t &mainBucketSize) const +void PlotBuilder::addSeparation(const Buckets &buckets, + AxisId axisIndex, + const std::size_t &otherBucketSize) const { - if (!plot->getOptions()->isSplit()) return; + if (!plot->getOptions()->isSplit(axisIndex)) return; - auto align = plot->getOptions()->align; + const auto &axisProps = + plot->getOptions()->getChannels().axisPropsAt(axisIndex); + auto align = axisProps.align; - std::vector ranges{mainBucketSize, Math::Range<>{{}, {}}}; - std::vector anyEnabled(mainBucketSize); + std::vector ranges{otherBucketSize, Math::Range<>{{}, {}}}; + std::vector anyEnabled(otherBucketSize); - auto &&subAxis = plot->getOptions()->subAxisType(); - for (auto &&bucket : subBuckets) + for (auto &&bucket : buckets) for (std::size_t i{}, prIx{}; auto &&[marker, idx] : bucket) { if (!marker.enabled) continue; (i += idx.itemId - std::exchange(prIx, idx.itemId)) %= ranges.size(); - ranges[i].include(marker.getSizeBy(subAxis).size()); + ranges[i].include(marker.getSizeBy(axisIndex).size()); anyEnabled[i] = true; } @@ -526,21 +551,20 @@ void PlotBuilder::addSeparation(const Buckets &subBuckets, if (anyEnabled[i]) max = max + ranges[i]; auto splitSpace = - plot->getStyle() - .plot.getAxis(plot->getOptions()->subAxisType()) - .spacing->get(max.max, plot->getStyle().calculatedSize()); + plot->getStyle().plot.getAxis(axisIndex).spacing->get(max.max, + plot->getStyle().calculatedSize()); for (auto i = 1U; i < ranges.size(); ++i) ranges[i] = ranges[i] + ranges[i - 1].max + (anyEnabled[i - 1] ? splitSpace : 0); - for (auto &&bucket : subBuckets) + for (auto &&bucket : buckets) for (std::size_t i{}, prIx{}; auto &&[marker, idx] : bucket) { (i += idx.itemId - std::exchange(prIx, idx.itemId)) %= ranges.size(); - marker.setSizeBy(subAxis, + marker.setSizeBy(axisIndex, Base::Align{align, ranges[i]}.getAligned( - marker.getSizeBy(subAxis))); + marker.getSizeBy(axisIndex))); } } diff --git a/src/chart/generator/plotbuilder.h b/src/chart/generator/plotbuilder.h index 560f6ab14..b96d7af67 100644 --- a/src/chart/generator/plotbuilder.h +++ b/src/chart/generator/plotbuilder.h @@ -34,23 +34,28 @@ class PlotBuilder }; void initDimensionTrackers(); - Buckets generateMarkers(std::size_t &mainBucketSize); - void linkMarkers(Buckets &subBuckets); + Buckets generateMarkers(std::size_t &mainBucketSize, + std::size_t &subBucketSize); + void linkMarkers(Buckets &buckets, + const std::size_t &mainBucketSize, + const std::size_t &subBucketSize); [[nodiscard]] bool linkMarkers(const Buckets &buckets, AxisId axisIndex) const; void calcAxises(const Data::DataTable &dataTable); void calcLegendAndLabel(const Data::DataTable &dataTable); void calcAxis(const Data::DataTable &dataTable, AxisId type); - void addAlignment(const Buckets &subBuckets) const; - void addSeparation(const Buckets &subBuckets, - const std::size_t &mainBucketSize) const; + void addAlignment(const Buckets &buckets, AxisId axisIndex) const; + void addSeparation(const Buckets &buckets, + AxisId axisIndex, + const std::size_t &otherBucketSize) const; void normalizeSizes(); void normalizeColors(); [[nodiscard]] std::vector - sortedBuckets(const Buckets &buckets, bool main) const; + sortedBuckets(const Buckets &buckets, AxisId axisIndex) const; void addSpecLayout(Buckets &buckets); - void addAxisLayout(Buckets &subBuckets, + void addAxisLayout(Buckets &buckets, const std::size_t &mainBucketSize, + const std::size_t &subBucketSize, const Data::DataTable &dataTable); }; } diff --git a/src/chart/options/channel.cpp b/src/chart/options/channel.cpp index 67fa66dda..cfeeea3ef 100644 --- a/src/chart/options/channel.cpp +++ b/src/chart/options/channel.cpp @@ -148,12 +148,7 @@ void Channel::reset() set = {}; labelLevel = {}; title = {}; - axis = Base::AutoBool(); - labels = Base::AutoBool(); - ticks = Base::AutoBool(); - guides = Base::AutoBool(); - markerGuides = Base::AutoBool(); - interlacing = Base::AutoBool(); + range = {}; } bool Channel::isEmpty() const diff --git a/src/chart/options/channel.h b/src/chart/options/channel.h index f9d6f89dd..8b011455d 100644 --- a/src/chart/options/channel.h +++ b/src/chart/options/channel.h @@ -9,8 +9,10 @@ #include "base/geom/orientation.h" #include "dataframe/old/types.h" +#include "align.h" #include "autoparam.h" #include "channelrange.h" +#include "sort.h" namespace Vizzu::Gen { @@ -118,9 +120,32 @@ struct ChannelSeriesList bool removeSeries(const Data::SeriesIndex &index); }; -class Channel +struct AxisChannelProperties +{ + Base::AutoBool axis{}; + Base::AutoBool labels{}; + Base::AutoBool ticks{}; + Base::AutoBool interlacing{}; + Base::AutoBool guides{}; + Base::AutoBool markerGuides{}; + Base::AutoParam step{}; + Sort sort{Sort::none}; + bool reverse{}; + Base::Align::Type align{Base::Align::Type::none}; + bool split{}; + + [[nodiscard]] bool operator==( + const AxisChannelProperties &oth) const + { + return axis == oth.axis && labels == oth.labels + && ticks == oth.ticks && interlacing == oth.interlacing + && guides == oth.guides + && markerGuides == oth.markerGuides && step == oth.step; + } +}; + +struct Channel { -public: using OptionalIndex = ChannelSeriesList::OptionalIndex; using IndexSet = std::set; using DimensionIndices = ChannelSeriesList::DimensionIndices; @@ -161,13 +186,6 @@ class Channel ChannelRange range{}; Base::AutoParam labelLevel{}; Base::AutoParam title{}; - Base::AutoBool axis{}; - Base::AutoBool labels{}; - Base::AutoBool ticks{}; - Base::AutoBool guides{}; - Base::AutoBool markerGuides{}; - Base::AutoBool interlacing{}; - Base::AutoParam step{}; }; [[nodiscard]] constexpr ChannelId operator+(const AxisId &axis) diff --git a/src/chart/options/channels.h b/src/chart/options/channels.h index dd01607d4..4510a0bfe 100644 --- a/src/chart/options/channels.h +++ b/src/chart/options/channels.h @@ -15,6 +15,7 @@ namespace Vizzu::Gen struct Channels : Refl::EnumArray { using IndexSet = std::set; + EnumArray axisProps; [[nodiscard]] bool anyAxisSet() const; [[nodiscard]] bool isEmpty() const; @@ -37,6 +38,17 @@ struct Channels : Refl::EnumArray return at(+id); } + [[nodiscard]] const AxisChannelProperties &axisPropsAt( + const AxisId &id) const + { + return axisProps[id]; + } + + [[nodiscard]] AxisChannelProperties &axisPropsAt(const AxisId &id) + { + return axisProps[id]; + } + void removeSeries(const Data::SeriesIndex &index); [[nodiscard]] bool isSeriesUsed( diff --git a/src/chart/options/config.cpp b/src/chart/options/config.cpp index d4bdd8897..34606b9fa 100644 --- a/src/chart/options/config.cpp +++ b/src/chart/options/config.cpp @@ -33,6 +33,12 @@ std::string Config::paramsJson() for (const auto ¶m : channelParams) arr << "channels." + std::string{channelName} + "." + std::string{param}; + + if (channelName == "x" || channelName == "y") + for (const auto ¶m : + getAccessorNames()) + arr << "channels." + std::string{channelName} + "." + + std::string{param}; } return res; } @@ -83,35 +89,39 @@ void Config::setChannelParam(const std::string &path, if (property == "set") { if (parts.size() == 3) { - channel.reset(); + channel.set = {}; options.markersInfo.clear(); return; } - if (auto &listParser = ChannelSeriesList::Parser::instance(); - parts.size() == 4) { + auto &listParser = ChannelSeriesList::Parser::instance(); + if (parts.size() == 4) { if (parts[3] == "begin") { - if (parts[2] == "set") channel.reset(); - + if (parts[2] == "set") channel.set = {}; options.markersInfo.clear(); listParser.table = &table.get(); listParser.channels.resize(std::stoull(value)); return; } - listParser.current = std::nullopt; - listParser.path = parts; } - else { + else listParser.current = std::stoull(parts.at(3)); - listParser.path = parts; - } + listParser.path = parts; } if (property == "range") property += "." + parts.at(3); if (auto &&accessor = getAccessor(property).set) accessor(channel, value); + else if (auto &&axisAccessor = + getAccessor(property).set; + (channelId == AxisId::x || channelId == AxisId::y) + && axisAccessor) + axisAccessor( + options.getChannels().axisPropsAt( + channelId == AxisId::x ? AxisId::x : AxisId::y), + value); else throw std::logic_error( path + "/" + value @@ -130,6 +140,11 @@ std::string Config::getChannelParam(const std::string &path) const if (auto &&accessor = getAccessor(property).get) return accessor(channel); + if (auto &&axisAccessor = + getAccessor(property).get; + (id == AxisId::x || id == AxisId::y) && axisAccessor) + return axisAccessor(options.get().getChannels().axisPropsAt( + id == AxisId::x ? AxisId::x : AxisId::y)); throw std::logic_error(path + ": invalid channel parameter"); } diff --git a/src/chart/options/options.cpp b/src/chart/options/options.cpp index 42a1aae94..ba5c5cdd1 100644 --- a/src/chart/options/options.cpp +++ b/src/chart/options/options.cpp @@ -91,10 +91,10 @@ std::optional Options::secondaryStackType() const return std::nullopt; } -bool Options::hasDimensionToSplit() const +bool Options::hasDimensionToSplit(AxisId at) const { - auto dims = subAxis().dimensions(); - dims.split_by(mainAxis().dimensions()); + auto dims = getChannels().at(at).dimensions(); + dims.split_by(getChannels().at(!at).dimensions()); return !dims.empty(); } @@ -111,7 +111,8 @@ Channels Options::shadowChannels() const &ch2 = shadow.at(ChannelId::noop); auto &&stacker : shadow.getDimensions({data(stackChannels), std::size_t{1} + secondary.has_value()})) { - if (stackChannelType() != subAxisType() || !isSplit()) + if (stackChannelType() != subAxisType() + || !isSplit(subAxisType())) ch1.removeSeries(stacker); ch2.removeSeries(stacker); } @@ -123,7 +124,9 @@ void Options::drilldownTo(const Options &other) { auto &stackChannel = this->stackChannel(); - if (!isSplit() || !other.isSplit()) this->split = {}; + for (auto &&axis : Refl::enum_values()) + if (!isSplit(axis) || !other.isSplit(axis)) + getChannels().axisPropsAt(axis).split = {}; for (auto &&dim : other.getChannels().getDimensions()) if (!getChannels().isSeriesUsed(dim)) @@ -136,7 +139,8 @@ void Options::intersection(const Options &other) if (!other.getChannels().isSeriesUsed(dim)) getChannels().removeSeries(dim); - split = {}; + getChannels().axisPropsAt(subAxisType()).split = {}; + getChannels().axisPropsAt(mainAxisType()).split = {}; } bool Options::looksTheSame(const Options &other) const @@ -157,7 +161,7 @@ bool Options::looksTheSame(const Options &other) const void Options::simplify() { - if (isSplit()) return; + if (isSplit(subAxisType())) return; // remove all dimensions, only used at the end of stack auto &stackChannel = this->stackChannel(); @@ -196,9 +200,9 @@ bool Options::sameShadowAttribs(const Options &other) const return shape == shapeOther && coordSystem == other.coordSystem && angle == other.angle && orientation == other.orientation - && isSplit() == other.isSplit() - && dataFilter == other.dataFilter && align == other.align - && sort == other.sort && reverse == other.reverse; + && isSplit(mainAxisType()) == other.isSplit(mainAxisType()) + && isSplit(subAxisType()) == other.isSplit(subAxisType()) + && dataFilter == other.dataFilter; } bool Options::sameAttributes(const Options &other) const diff --git a/src/chart/options/options.h b/src/chart/options/options.h index f826c7273..c18abfca2 100644 --- a/src/chart/options/options.h +++ b/src/chart/options/options.h @@ -14,12 +14,10 @@ #include "base/math/range.h" #include "dataframe/old/types.h" -#include "align.h" #include "autoparam.h" #include "channels.h" #include "coordsystem.h" #include "shapetype.h" -#include "sort.h" namespace Vizzu::Gen { @@ -41,10 +39,6 @@ struct OptionProperties double angle{}; ::Anim::Interpolated geometry{ShapeType::rectangle}; Orientation orientation{OrientationType{}}; - Sort sort{Sort::none}; - bool reverse{}; - Base::Align::Type align{Base::Align::Type::none}; - bool split{}; }; class Options : public OptionProperties @@ -146,10 +140,11 @@ class Options : public OptionProperties return channels.at(stackChannelType()); } - [[nodiscard]] bool hasDimensionToSplit() const; - [[nodiscard]] bool isSplit() const + [[nodiscard]] bool hasDimensionToSplit(AxisId at) const; + [[nodiscard]] bool isSplit(AxisId byAxis) const { - return split && hasDimensionToSplit(); + return getChannels().axisPropsAt(byAxis).split + && hasDimensionToSplit(byAxis); } Data::Filter dataFilter; std::optional tooltip; @@ -206,7 +201,9 @@ class Options : public OptionProperties [](std::index_sequence) { return decltype(channels){ - Channel::makeChannel(static_cast(Ix))...}; + {{Channel::makeChannel( + static_cast(Ix))...}}, + {}}; }(std::make_index_sequence< std::tuple_size_v>{})}; diff --git a/test/e2e/test_cases/basic_animations/someOtherTests/merge_split_area_stream_2dis_1con.mjs b/test/e2e/test_cases/basic_animations/someOtherTests/merge_split_area_stream_2dis_1con.mjs index 7d45ddb4d..3bf8f0537 100755 --- a/test/e2e/test_cases/basic_animations/someOtherTests/merge_split_area_stream_2dis_1con.mjs +++ b/test/e2e/test_cases/basic_animations/someOtherTests/merge_split_area_stream_2dis_1con.mjs @@ -7,12 +7,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Revenue', 'Format'], + y: { set: ['Revenue', 'Format'], align: 'center' }, color: 'Format' }, title: 'Stacked Streamgraph', - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { @@ -34,12 +33,12 @@ const testSteps = [ y: { range: { max: '100%' - } + }, + split: true, + align: 'none' } }, - title: 'Split Area Chart', - split: true, - align: 'none' + title: 'Split Area Chart' } }), @@ -48,12 +47,10 @@ const testSteps = [ config: { channels: { x: ['Revenue', 'Year'], - y: 'Format' + y: { set: 'Format', split: false } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false, - align: 'none' + geometry: 'rectangle' }, style: { plot: { diff --git a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_bar.mjs b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_bar.mjs index c7d9bd635..44321f05f 100755 --- a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_bar.mjs +++ b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_bar.mjs @@ -23,11 +23,11 @@ const testSteps = [ the y-axis as the default value is now 110% */ range: { max: '100%' - } + }, + split: true } }, - title: 'Trellis Area Chart', - split: true + title: 'Trellis Area Chart' } }), (chart) => @@ -35,11 +35,10 @@ const testSteps = [ config: { channels: { x: ['Value 2 (+)', 'Year'], - y: 'Country' + y: { set: 'Country', split: false } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_column.mjs b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_column.mjs index 239d30899..d66626a8f 100755 --- a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_column.mjs +++ b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_area_column.mjs @@ -19,7 +19,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split Area Chart', - split: true + y: { split: true } } }), @@ -27,12 +27,11 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 2 (+)', 'Year'], + y: { set: ['Value 2 (+)', 'Year'], split: false }, x: 'Joy factors' }, title: 'Column Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), @@ -45,8 +44,7 @@ const testSteps = [ label: 'Value 2 (+)' }, title: 'Column Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }) ] diff --git a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_bar_line.mjs b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_bar_line.mjs index 0c2a7729b..fa967c881 100755 --- a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_bar_line.mjs +++ b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_bar_line.mjs @@ -19,12 +19,11 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Joy factors', + y: { set: 'Joy factors', sort: 'byValue' }, x: ['Value 2 (+)', 'Year'] }, title: 'Bar Chart', - geometry: 'rectangle', - sort: 'byValue' + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_column_line.mjs b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_column_line.mjs index e18c8ed86..0d39b612a 100755 --- a/test/e2e/test_cases/basic_animations/someOtherTests/total_time_column_line.mjs +++ b/test/e2e/test_cases/basic_animations/someOtherTests/total_time_column_line.mjs @@ -21,11 +21,10 @@ const testSteps = [ config: { channels: { y: ['Value 2 (+)', 'Year'], - x: 'Joy factors' + x: { set: 'Joy factors', sort: 'byValue' } }, title: 'Column Chart', - geometry: 'rectangle', - sort: 'byValue' + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/operations/all_operations.mjs b/test/e2e/test_cases/operations/all_operations.mjs index 3681d9978..8b57c095d 100755 --- a/test/e2e/test_cases/operations/all_operations.mjs +++ b/test/e2e/test_cases/operations/all_operations.mjs @@ -110,7 +110,7 @@ const testSteps = [ chart.animate({ config: { title: 'Comparing ratios is just another option out of many more...', - align: 'stretch' + y: { align: 'stretch' } } }) ] diff --git a/test/e2e/test_cases/operations/all_operations_sizeing.mjs b/test/e2e/test_cases/operations/all_operations_sizeing.mjs index 5725b5849..9e86fd3e1 100755 --- a/test/e2e/test_cases/operations/all_operations_sizeing.mjs +++ b/test/e2e/test_cases/operations/all_operations_sizeing.mjs @@ -178,7 +178,7 @@ const testSteps = [ chart.animate({ config: { title: 'Comparing ratios is just another option out of many more...', - align: 'stretch' + y: { align: 'stretch' } } }) ] diff --git a/test/e2e/test_cases/operations/histogram_2_drilldown_negative_1dis_1con.mjs b/test/e2e/test_cases/operations/histogram_2_drilldown_negative_1dis_1con.mjs index b91dca30d..17962dd3c 100755 --- a/test/e2e/test_cases/operations/histogram_2_drilldown_negative_1dis_1con.mjs +++ b/test/e2e/test_cases/operations/histogram_2_drilldown_negative_1dis_1con.mjs @@ -10,8 +10,7 @@ const testSteps = [ y: { attach: ['Value 2 (+)'], range: { min: '0%', max: '110%' } }, label: { attach: ['Value 2 (+)'] } }, - title: 'Histogram with (-) Nums', - align: 'none' + title: 'Histogram with (-) Nums' } }), (chart) => @@ -37,8 +36,7 @@ const testSteps = [ x: { attach: ['Joy factors'] }, label: { detach: ['Value 2 (+)'], attach: ['Value 5 (+/-)'] } }, - title: 'Grouped with (-) Nums', - split: true + title: 'Grouped with (-) Nums' }, style: { plot: { diff --git a/test/e2e/test_cases/operations/split_merge_tutorial_data/area_split_merge.mjs b/test/e2e/test_cases/operations/split_merge_tutorial_data/area_split_merge.mjs index 3d270d921..ff4f19b9b 100755 --- a/test/e2e/test_cases/operations/split_merge_tutorial_data/area_split_merge.mjs +++ b/test/e2e/test_cases/operations/split_merge_tutorial_data/area_split_merge.mjs @@ -22,14 +22,14 @@ const testSteps = [ chart.animate({ config: { title: 'Operations: Area - Splitted.', - split: true + y: { split: true } } }), (chart) => chart.animate({ config: { title: 'Operations: Area - Merged.', - split: false + y: { split: false } } }) ] diff --git a/test/e2e/test_cases/operations/split_merge_tutorial_data/circle_split_merge.mjs b/test/e2e/test_cases/operations/split_merge_tutorial_data/circle_split_merge.mjs index a0fb981b5..fcd2cc2ff 100755 --- a/test/e2e/test_cases/operations/split_merge_tutorial_data/circle_split_merge.mjs +++ b/test/e2e/test_cases/operations/split_merge_tutorial_data/circle_split_merge.mjs @@ -20,22 +20,19 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { attach: ['Categ. Parent'] } + y: { attach: ['Categ. Parent'], split: true } }, title: 'Operations: Circle - Splitted.', - orientation: 'horizontal', - split: true, - align: 'none' + orientation: 'horizontal' } }), (chart) => chart.animate({ config: { channels: { - y: { detach: ['Categ. Parent'] } + y: { detach: ['Categ. Parent'], split: false } }, - title: 'Operations: Circle - Merged.', - split: false + title: 'Operations: Circle - Merged.' } }) ] diff --git a/test/e2e/test_cases/operations/split_merge_tutorial_data/line_split_merge.mjs b/test/e2e/test_cases/operations/split_merge_tutorial_data/line_split_merge.mjs index c69569cab..b2da20bd7 100755 --- a/test/e2e/test_cases/operations/split_merge_tutorial_data/line_split_merge.mjs +++ b/test/e2e/test_cases/operations/split_merge_tutorial_data/line_split_merge.mjs @@ -19,20 +19,18 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { attach: ['Categ. Parent'] } + y: { attach: ['Categ. Parent'], split: true } }, - title: 'Operations: Area - Splitted.', - split: true + title: 'Operations: Area - Splitted.' } }), (chart) => chart.animate({ config: { channels: { - y: { detach: ['Categ. Parent'] } + y: { detach: ['Categ. Parent'], split: false } }, - title: 'Operations: Area - Merged.', - split: false + title: 'Operations: Area - Merged.' } }) ] diff --git a/test/e2e/test_cases/operations/split_merge_tutorial_data/rectangle_split_merge.mjs b/test/e2e/test_cases/operations/split_merge_tutorial_data/rectangle_split_merge.mjs index affa5d6fb..fc22034a8 100755 --- a/test/e2e/test_cases/operations/split_merge_tutorial_data/rectangle_split_merge.mjs +++ b/test/e2e/test_cases/operations/split_merge_tutorial_data/rectangle_split_merge.mjs @@ -22,7 +22,7 @@ const testSteps = [ chart.animate({ config: { title: 'Operations: Rectangle - Splitted.', - split: true + y: { split: true } }, style: { plot: { marker: { label: { position: 'top' } } } } }), @@ -30,7 +30,7 @@ const testSteps = [ chart.animate({ config: { title: 'Operations: Rectangle - Merged.', - split: false + y: { split: false } }, style: { plot: { marker: { label: { position: null } } } } }) diff --git a/test/e2e/test_cases/shorthands/column_shorthands.mjs b/test/e2e/test_cases/shorthands/column_shorthands.mjs index 307c1a007..98ca73712 100755 --- a/test/e2e/test_cases/shorthands/column_shorthands.mjs +++ b/test/e2e/test_cases/shorthands/column_shorthands.mjs @@ -21,11 +21,11 @@ const testSteps = [ }, (chart) => chart.animate({ - align: 'stretch' + y: { align: 'stretch' } }), (chart) => chart.animate({ - align: 'none' + y: { align: 'none' } }), (chart) => chart.animate({ diff --git a/test/e2e/test_cases/static_chart_types/polar_coo_sys/spiderweb_line_1dis_1con.mjs b/test/e2e/test_cases/static_chart_types/polar_coo_sys/spiderweb_line_1dis_1con.mjs index d8b1d678f..4d5235903 100755 --- a/test/e2e/test_cases/static_chart_types/polar_coo_sys/spiderweb_line_1dis_1con.mjs +++ b/test/e2e/test_cases/static_chart_types/polar_coo_sys/spiderweb_line_1dis_1con.mjs @@ -11,7 +11,6 @@ const testSteps = [ label: 'Value 2 (+)' }, title: 'Spiderweb 1Line (fake. no multiaxes)', - align: 'none', geometry: 'line', coordSystem: 'polar' }, diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/area_100percent_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/area_100percent_stacked.mjs index 1b9e67fd9..ec2b40b68 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/area_100percent_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/area_100percent_stacked.mjs @@ -12,12 +12,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: 'Country' }, - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), @@ -25,11 +24,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 2 (+)' + y: { set: 'Value 2 (+)', align: 'none' } }, - geometry: 'line', - align: 'none' + geometry: 'line' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/area_polar_split.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/area_polar_split.mjs index 279f37aa9..d67a7752f 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/area_polar_split.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/area_polar_split.mjs @@ -11,12 +11,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 1 (+)', 'Country'], + y: { set: ['Value 1 (+)', 'Country'], split: true }, color: 'Country' }, - geometry: 'area', - split: true, coordSystem: 'polar' } }), @@ -25,11 +23,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 1 (+)' + y: { set: 'Value 1 (+)', split: false } }, - geometry: 'line', - split: false + geometry: 'line' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/area_split_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/area_split_stacked.mjs index bc7f539da..5286dfc1b 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/area_split_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/area_split_stacked.mjs @@ -11,12 +11,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: 'Country' }, - geometry: 'area', - split: true + geometry: 'area' } }), @@ -24,11 +23,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 2 (+)' + y: { set: 'Value 2 (+)', split: false } }, - geometry: 'line', - split: false + geometry: 'line' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/column_100percent_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/column_100percent_stacked.mjs index f297b2cd1..6a1750283 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/column_100percent_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/column_100percent_stacked.mjs @@ -11,11 +11,9 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' - }, - - align: 'stretch' + } } }), @@ -24,10 +22,12 @@ const testSteps = [ config: { channels: { x: ['Year', 'Country'], - y: 'Value 2 (+)' - }, + y: { + set: 'Value 2 (+)', - align: 'none' + align: 'none' + } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_1.mjs index b41cdc30c..d92c753cf 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_1.mjs @@ -22,11 +22,9 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_2.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_2.mjs index d51069570..203bb7ff9 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_2.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/column_groupped_2.mjs @@ -21,11 +21,9 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_1.mjs index f1c41f3d4..493fc00ed 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_1.mjs @@ -11,12 +11,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { @@ -35,11 +33,9 @@ const testSteps = [ config: { channels: { x: ['Year', 'Country'], - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, label: null - }, - - split: false + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_2.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_2.mjs index b58c64568..57cdc474e 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_2.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/column_split_stacked_2.mjs @@ -11,12 +11,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { @@ -35,11 +33,9 @@ const testSteps = [ config: { channels: { x: ['Country', 'Year'], - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, label: null - }, - - split: false + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/coxcomb_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/coxcomb_1.mjs index 21407b877..a4b385288 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/coxcomb_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/coxcomb_1.mjs @@ -22,10 +22,8 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'] - }, - - split: true + y: { set: ['Country', 'Value 2 (+)'], split: true } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/line.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/line.mjs index b9c09d5e6..932928e1d 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/line.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/line.mjs @@ -23,11 +23,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 2 (+)', 'Country'] + y: { set: ['Value 2 (+)', 'Country'], split: true } }, - geometry: 'area', - split: true + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/line_polar.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/line_polar.mjs index 51bcb2bfa..956c29aaf 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/line_polar.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/line_polar.mjs @@ -24,11 +24,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' } } + y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' }, split: true } }, - geometry: 'area', - split: true + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/compare/stream_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/compare/stream_stacked.mjs index 978fdcff5..574f108ea 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/compare/stream_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/compare/stream_stacked.mjs @@ -25,12 +25,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Revenue', 'Format'], + y: { set: ['Revenue', 'Format'], align: 'center' }, color: 'Format' }, - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { @@ -50,7 +49,7 @@ const testSteps = [ (chart) => chart.animate({ - config: { + y: { align: 'none', split: true } @@ -61,10 +60,12 @@ const testSteps = [ config: { channels: { x: ['Format', 'Year'], - y: 'Revenue' - }, + y: { + set: 'Revenue', - split: false + split: false + } + } }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/distribute/existingmeasure_scatterplot_split.mjs b/test/e2e/test_cases/web_content/analytical_operations/distribute/existingmeasure_scatterplot_split.mjs index 96fafd8c9..5164336f6 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/distribute/existingmeasure_scatterplot_split.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/distribute/existingmeasure_scatterplot_split.mjs @@ -9,14 +9,13 @@ const testSteps = [ config: { channels: { - x: ['Value 1 (+)', 'Country'], + x: { set: ['Value 1 (+)', 'Country'], split: true }, y: 'Value 3 (+)', noop: 'Year', color: 'Country' }, geometry: 'circle', - split: true, orientation: 'vertical' } }), @@ -25,10 +24,8 @@ const testSteps = [ chart.animate({ config: { channels: { - x: 'Value 1 (+)' - }, - - split: false + x: { set: 'Value 1 (+)', split: false } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_column_split_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_column_split_stacked.mjs index 47bade16c..a1564804f 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_column_split_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_column_split_stacked.mjs @@ -13,12 +13,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { @@ -37,12 +35,11 @@ const testSteps = [ config: { channels: { x: 'Value 5 (+/-)', - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, label: 'Year' }, - geometry: 'circle', - split: false + geometry: 'circle' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_dotplot_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_dotplot_1.mjs index d4f7080b8..e8e3fe5f8 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_dotplot_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/distribute/newmeasure_dotplot_1.mjs @@ -22,11 +22,11 @@ const testSteps = [ config: { channels: { y: { set: 'IMDb Rating', range: { max: '105%' } }, + x: { split: true }, noop: 'Index' }, - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/filter/stream_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/filter/stream_1.mjs index d919ef5f9..23a74da4e 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/filter/stream_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/filter/stream_1.mjs @@ -10,12 +10,11 @@ const testSteps = [ config: { channels: { x: ['Year'], - y: ['Revenue', 'Format'], + y: { set: ['Revenue', 'Format'], align: 'center' }, color: 'Format' }, - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/filter/stream_2.mjs b/test/e2e/test_cases/web_content/analytical_operations/filter/stream_2.mjs index 9bf9c79b1..a8a003819 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/filter/stream_2.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/filter/stream_2.mjs @@ -20,12 +20,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year', range: { max: '48' } }, // 48 = years in this time period - y: ['Revenue', 'Format'], + y: { set: ['Revenue', 'Format'], align: 'center' }, color: 'Format' }, - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/misc/orientation_marimekko.mjs b/test/e2e/test_cases/web_content/analytical_operations/misc/orientation_marimekko.mjs index 61a4aeb93..58ef6210a 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/misc/orientation_marimekko.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/misc/orientation_marimekko.mjs @@ -8,13 +8,12 @@ const testSteps = [ config: { channels: { x: ['Country', 'Value 2 (+)'], - y: ['Joy factors', 'Value 3 (+)'], + y: { set: ['Joy factors', 'Value 3 (+)'], align: 'stretch' }, color: 'Joy factors', label: 'Value 2 (+)', lightness: 'Country' }, - align: 'stretch', orientation: 'horizontal' } }), @@ -22,6 +21,8 @@ const testSteps = [ (chart) => chart.animate({ config: { + x: { align: 'stretch' }, + y: { align: 'none' }, orientation: 'vertical', label: 'Value 3 (+)' } diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/area_polar_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/area_polar_stacked.mjs index 3559b070f..1fc2eee9f 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/area_polar_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/area_polar_stacked.mjs @@ -21,7 +21,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: true + y: { split: true } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/area_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/area_stacked.mjs index d625ff016..28eb9720c 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/area_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/area_stacked.mjs @@ -20,7 +20,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: true + y: { split: true } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/column_100percent_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/column_100percent_stacked.mjs index 3f1e1a8f4..89fcaf02a 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/column_100percent_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/column_100percent_stacked.mjs @@ -12,22 +12,21 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' - }, - - align: 'stretch' + } } }), (chart) => chart.animate({ config: { channels: { + y: { + align: 'none', + split: true + }, label: 'Value 2 (+)' - }, - - align: 'none', - split: true + } }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/column_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/column_stacked.mjs index cd2fef3c0..9cc0d75ef 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/column_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/column_stacked.mjs @@ -19,10 +19,9 @@ const testSteps = [ chart.animate({ config: { channels: { - label: 'Value 2 (+)' - }, - - split: true + label: 'Value 2 (+)', + y: { split: true } + } }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/coxcomb.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/coxcomb.mjs index 03aa86629..10b437ced 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/coxcomb.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/coxcomb.mjs @@ -26,7 +26,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: true + y: { split: true } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/radial_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/radial_stacked.mjs index 75b01a79c..e59351afb 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/radial_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/radial_stacked.mjs @@ -26,7 +26,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: true + x: { split: true } } }) ] diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_1.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_1.mjs index cb3e996c9..489ec8730 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_1.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_1.mjs @@ -24,12 +24,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: ['Value 2 (+)', 'Country'] + x: { set: ['Value 2 (+)', 'Country'], split: true } }, geometry: 'circle', - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_2.mjs b/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_2.mjs index ab1e30b95..a4e31078f 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_2.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/split/scatterplot_2.mjs @@ -24,12 +24,11 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 3 (+)', 'Country'] + y: { set: ['Value 3 (+)', 'Country'], split: true } }, geometry: 'circle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/area_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/area_stacked.mjs index 381527892..2ebd38dd3 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/area_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/area_stacked.mjs @@ -20,7 +20,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - align: 'stretch' + y: { align: 'stretch' } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_groupped.mjs b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_groupped.mjs index b528d7982..0d6421ee4 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_groupped.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_groupped.mjs @@ -21,10 +21,8 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'] - }, - - align: 'stretch' + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_split_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_split_stacked.mjs index 17ec0adad..23b2545b7 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_split_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_split_stacked.mjs @@ -10,12 +10,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { @@ -33,11 +31,9 @@ const testSteps = [ chart.animate({ config: { channels: { - label: null - }, - - align: 'stretch', - split: false + label: null, + y: { align: 'stretch', split: false } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_stacked.mjs index 3129a89f6..80cb7492d 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/column_stacked.mjs @@ -18,7 +18,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - align: 'stretch' + y: { align: 'stretch' } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/line.mjs b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/line.mjs index 8e34d70be..d1d329ae1 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/line.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/stretch_to_proportion/line.mjs @@ -23,11 +23,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 2 (+)', 'Country'] + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' } }, - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/area_100percent_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/area_100percent_stacked.mjs index ef20b6506..b17d32717 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/area_100percent_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/area_100percent_stacked.mjs @@ -10,18 +10,17 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: 'Country' }, - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), (chart) => chart.animate({ - config: { + y: { align: 'none' } }), diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/area_polar_split.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/area_polar_split.mjs index 27590026a..858f08f97 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/area_polar_split.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/area_polar_split.mjs @@ -9,12 +9,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' } }, + y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' }, split: true }, color: 'Country' }, - geometry: 'area', - split: true, coordSystem: 'polar' } }), @@ -22,7 +20,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: false + y: { split: false } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/area_split.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/area_split.mjs index 94b46cfc7..45f73e24a 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/area_split.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/area_split.mjs @@ -9,19 +9,18 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: 'Country' }, - geometry: 'area', - split: true + geometry: 'area' } }), (chart) => chart.animate({ config: { - split: false + y: { split: false } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/bubble_to_radial.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/bubble_to_radial.mjs index c0be8c37c..310316768 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/bubble_to_radial.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/bubble_to_radial.mjs @@ -35,7 +35,7 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { set: 'Joy factors', range: { min: '-30%' } }, + y: { set: 'Joy factors', range: { min: '-30%' }, sort: 'byValue' }, x: ['Country_code', 'Value 2 (+)'], label: null, /* The stacking is eliminated when we remove @@ -44,8 +44,7 @@ const testSteps = [ }, geometry: 'rectangle', - coordSystem: 'polar', - sort: 'byValue' + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/column_100percent_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/column_100percent_stacked.mjs index 5db432215..9dc1811dd 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/column_100percent_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/column_100percent_stacked.mjs @@ -10,17 +10,19 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], - color: 'Country' - }, + y: { + set: ['Country', 'Value 2 (+)'], - align: 'stretch' + align: 'stretch' + }, + color: 'Country' + } } }), (chart) => chart.animate({ - config: { + y: { align: 'none' } }), diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/column_split_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/column_split_stacked.mjs index 270f6e5cc..a79ea6e64 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/column_split_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/column_split_stacked.mjs @@ -11,12 +11,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' - }, - - split: true + } }, style: { plot: { @@ -34,10 +32,9 @@ const testSteps = [ chart.animate({ config: { channels: { - label: null - }, - - split: false + label: null, + y: { split: false } + } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/coxcomb_split.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/coxcomb_split.mjs index b18fd521b..36b9d10ca 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/coxcomb_split.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/coxcomb_split.mjs @@ -9,11 +9,9 @@ const testSteps = [ config: { channels: { x: 'Year', - y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' } }, + y: { set: ['Country', 'Value 2 (+)'], range: { min: '-20%' }, split: true }, color: 'Country' }, - - split: true, coordSystem: 'polar' }, style: { @@ -28,7 +26,7 @@ const testSteps = [ (chart) => chart.animate({ config: { - split: false + y: { split: false } } }), (chart) => { diff --git a/test/e2e/test_cases/web_content/analytical_operations/sum/stream_stacked.mjs b/test/e2e/test_cases/web_content/analytical_operations/sum/stream_stacked.mjs index 420167bf0..bcedb0fce 100755 --- a/test/e2e/test_cases/web_content/analytical_operations/sum/stream_stacked.mjs +++ b/test/e2e/test_cases/web_content/analytical_operations/sum/stream_stacked.mjs @@ -26,12 +26,14 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Revenue', 'Format'], + y: { + set: ['Revenue', 'Format'], + align: 'center' + }, color: 'Format' }, - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { @@ -51,7 +53,7 @@ const testSteps = [ (chart) => chart.animate({ - config: { + y: { split: true } }), @@ -60,15 +62,16 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Revenue', 'Year'], - x: ['Format'] + y: { set: ['Revenue', 'Year'], align: 'none', split: false }, + x: { + set: ['Format'], + + sort: 'byValue', + reverse: true + } }, - geometry: 'rectangle', - align: 'none', - split: false, - sort: 'byValue', - reverse: true + geometry: 'rectangle' }, style: { plot: { diff --git a/test/e2e/test_cases/web_content/cookbook/chart_types/gant_chart.mjs b/test/e2e/test_cases/web_content/cookbook/chart_types/gant_chart.mjs index 78ef53397..31b2fc340 100644 --- a/test/e2e/test_cases/web_content/cookbook/chart_types/gant_chart.mjs +++ b/test/e2e/test_cases/web_content/cookbook/chart_types/gant_chart.mjs @@ -24,11 +24,10 @@ const testSteps = [ data, config: { x: ['Days', 'Helper'], - y: 'Task', + y: { set: 'Task', reverse: true }, color: 'Helper', title: 'Gant Chart', - legend: null, - reverse: true + legend: null }, style: { 'plot.marker.colorPalette': '#ffffff00 #01abf6ff' diff --git a/test/e2e/test_cases/web_content/cookbook/interactive/filter_slider.mjs b/test/e2e/test_cases/web_content/cookbook/interactive/filter_slider.mjs index 7550c7cac..5e6bc6ba1 100644 --- a/test/e2e/test_cases/web_content/cookbook/interactive/filter_slider.mjs +++ b/test/e2e/test_cases/web_content/cookbook/interactive/filter_slider.mjs @@ -29,10 +29,9 @@ const testSteps = [ data, config: { x: 'Revenue', - y: 'Format', + y: { set: 'Format', sort: 'byValue' }, color: 'Format', label: 'Revenue', - sort: 'byValue', title: 'Filter with slider' } }) diff --git a/test/e2e/test_cases/web_content/infinite.mjs b/test/e2e/test_cases/web_content/infinite.mjs index db6e82bb7..beb441a76 100755 --- a/test/e2e/test_cases/web_content/infinite.mjs +++ b/test/e2e/test_cases/web_content/infinite.mjs @@ -11,7 +11,6 @@ const testSteps = [ y: { attach: ['Ver'], range: { max: '375' } }, color: { set: ['Joy factors'] } }, - align: 'none', geometry: 'circle', legend: null }, @@ -539,12 +538,11 @@ const testSteps = [ x: { set: ['Joy factors', 'Country code'], range: { max: '100%' } }, y: { set: ['Value 1', 'Age group'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true } }, - title: '24', - split: true - // legend: 'color' + title: '24' }, style: { plot: { @@ -564,13 +562,13 @@ const testSteps = [ x: { set: ['Joy factors', 'Country code'], range: { max: '100%' } }, y: { set: ['Value 1', 'Age group'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'stretch', + split: false } }, title: '25', - geometry: 'area', - align: 'stretch', - split: false + geometry: 'area' }, style: { plot: { @@ -590,13 +588,13 @@ const testSteps = [ x: { set: ['Joy factors', 'Country code'], range: { max: '100%' } }, y: { set: ['Value 1', 'Age group'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'center', + split: true } }, title: '26', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' }, style: { plot: { @@ -622,9 +620,7 @@ const testSteps = [ color: { set: ['Joy factors'] } }, title: '27', - geometry: 'circle', - align: 'center', - split: true + geometry: 'circle' }, style: { plot: { @@ -668,16 +664,19 @@ const testSteps = [ config: { channels: { x: { set: ['Joy factors'], range: { min: '0%', max: '100%' } }, - y: { set: ['Value 1'], range: { min: '0%', max: '100%' } }, + y: { + set: ['Value 1'], + range: { min: '0%', max: '100%' }, + align: 'none', + split: false + }, color: { set: ['Joy factors'] }, lightness: { set: ['Value 3'] }, noop: { set: ['Country code', 'Age group'] }, size: { set: ['Value 2' /*, 'Age group' */] } }, title: '29', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -705,9 +704,7 @@ const testSteps = [ size: { set: ['Value 2' /*, 'Age group' */] } }, title: '30', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -735,9 +732,7 @@ const testSteps = [ size: { set: ['Value 1'] } }, title: '30a', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -767,9 +762,7 @@ const testSteps = [ size: { set: ['Value 1', 'Country code'] } }, title: '31', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -799,9 +792,7 @@ const testSteps = [ size: { set: ['Value 1', 'Country code', 'Age group'] } }, title: '32', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -832,9 +823,7 @@ const testSteps = [ size: { set: ['Value 1'] } }, title: '33', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' }, style: { plot: { @@ -862,7 +851,6 @@ const testSteps = [ label: { set: null } }, title: null, - align: 'none', geometry: 'circle', legend: null }, diff --git a/test/e2e/test_cases/web_content/static/chart/marimekko.mjs b/test/e2e/test_cases/web_content/static/chart/marimekko.mjs index fa06ae1e8..5c104ebd8 100755 --- a/test/e2e/test_cases/web_content/static/chart/marimekko.mjs +++ b/test/e2e/test_cases/web_content/static/chart/marimekko.mjs @@ -7,12 +7,11 @@ const testSteps = [ config: { channels: { x: ['Country', 'Value 2 (+)'], - y: ['Joy factors', 'Value 3 (+)'], + y: { set: ['Joy factors', 'Value 3 (+)'], align: 'stretch' }, color: 'Joy factors', label: ['Value 2 (+)'] }, title: 'Marimekko Chart', - align: 'stretch', orientation: 'horizontal' }, style: { diff --git a/test/e2e/test_cases/web_content/static/graph/stream_stacked.mjs b/test/e2e/test_cases/web_content/static/graph/stream_stacked.mjs index 854e4a253..839f1f9b4 100755 --- a/test/e2e/test_cases/web_content/static/graph/stream_stacked.mjs +++ b/test/e2e/test_cases/web_content/static/graph/stream_stacked.mjs @@ -12,12 +12,11 @@ const testSteps = [ config: { channels: { x: ['Year', 'Joy factors'], - y: ['Value 3 (+)', 'Country_code'], + y: { set: ['Value 3 (+)', 'Country_code'], align: 'center' }, color: 'Country_code' }, title: 'Stacked Stream Graph', - geometry: 'area', - align: 'center' + geometry: 'area' } }) ] diff --git a/test/e2e/test_cases/web_content/static/histogram.mjs b/test/e2e/test_cases/web_content/static/histogram.mjs index b3f243c37..08f8e7039 100755 --- a/test/e2e/test_cases/web_content/static/histogram.mjs +++ b/test/e2e/test_cases/web_content/static/histogram.mjs @@ -10,8 +10,7 @@ const testSteps = [ y: 'Value 5 (+/-)', label: 'Value 5 (+/-)' }, - title: 'Histogram', - align: 'none' + title: 'Histogram' }, /* Spaces between markers should be eliminated on this chart. */ diff --git a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_area_stream_3dis_1con.mjs b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_area_stream_3dis_1con.mjs index 1a34a87c2..eb3d16b7c 100755 --- a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_area_stream_3dis_1con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_area_stream_3dis_1con.mjs @@ -19,7 +19,7 @@ const testSteps = [ chart.animate({ config: { title: '100% Stacked Area Chart', - align: 'stretch' + y: { align: 'stretch' } } }), @@ -32,12 +32,12 @@ const testSteps = [ as the default value is now 110% */ range: { max: '100%' - } + }, + align: 'none', + split: true } }, - title: 'Split Area Chart', - align: 'none', - split: true + title: 'Split Area Chart' } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_3dis_1con.mjs b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_3dis_1con.mjs index b53b71535..2696fc99b 100755 --- a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_3dis_1con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_3dis_1con.mjs @@ -18,7 +18,7 @@ const testSteps = [ chart.animate({ config: { title: '100% Stacked Column Chart', - align: 'stretch' + y: { align: 'stretch' } } }), @@ -31,12 +31,12 @@ const testSteps = [ as the default value is now 110% */ range: { max: '100%' - } + }, + align: 'none', + split: true } }, - title: 'Split Column Chart', - align: 'none', - split: true + title: 'Split Column Chart' } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_stream_3dis_1con.mjs b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_stream_3dis_1con.mjs index 1d3745c63..1b1f65b71 100755 --- a/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_stream_3dis_1con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/composition_percentage_column_stream_3dis_1con.mjs @@ -25,13 +25,13 @@ const testSteps = [ as the default value is now 110% */ range: { max: '100%' - } + }, + split: true }, color: 'Country', noop: null }, - title: 'Split Column Chart', - split: true + title: 'Split Column Chart' } }), @@ -43,11 +43,11 @@ const testSteps = [ /* Setting back the y-axis range to the default value. */ range: { max: 'auto' - } + }, + split: false } }, - title: 'Stacked Column Chart', - split: false + title: 'Stacked Column Chart' } }), @@ -55,7 +55,7 @@ const testSteps = [ chart.animate({ config: { title: '100% Column Chart', - align: 'stretch' + y: { align: 'stretch' } } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/merge_split_area_stream_3dis_1con.mjs b/test/e2e/test_cases/web_content_removed/animated/merge_split_area_stream_3dis_1con.mjs index 0458fe7c7..eaa38855d 100755 --- a/test/e2e/test_cases/web_content_removed/animated/merge_split_area_stream_3dis_1con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/merge_split_area_stream_3dis_1con.mjs @@ -7,12 +7,11 @@ const testSteps = [ config: { channels: { x: ['Year', 'Joy factors'], - y: ['Value 3 (+)', 'Country'], + y: { set: ['Value 3 (+)', 'Country'], align: 'center' }, color: 'Country' }, title: 'Stacked Streamgraph', - geometry: 'area', - align: 'center' + geometry: 'area' } }), @@ -25,12 +24,12 @@ const testSteps = [ the y-axis as the default value is now 110% */ range: { max: '100%' - } + }, + split: true, + align: 'none' } }, - title: 'Split Area Chart', - split: true, - align: 'none' + title: 'Split Area Chart' } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/merge_split_bar.mjs b/test/e2e/test_cases/web_content_removed/animated/merge_split_bar.mjs index 1a5427752..0e41e38fb 100755 --- a/test/e2e/test_cases/web_content_removed/animated/merge_split_bar.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/merge_split_bar.mjs @@ -18,7 +18,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split Bar Chart', - split: true + x: { split: true } } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs b/test/e2e/test_cases/web_content_removed/animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs index 0f9781c89..eadb95afe 100755 --- a/test/e2e/test_cases/web_content_removed/animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs @@ -31,7 +31,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split Radial Bar Chart', - split: true + x: { split: true } } }) ] diff --git a/test/e2e/test_cases/web_content_removed/animated/orientation_marimekko_rectangle_2dis_2con.mjs b/test/e2e/test_cases/web_content_removed/animated/orientation_marimekko_rectangle_2dis_2con.mjs index 8f2039110..63ab3fcc8 100755 --- a/test/e2e/test_cases/web_content_removed/animated/orientation_marimekko_rectangle_2dis_2con.mjs +++ b/test/e2e/test_cases/web_content_removed/animated/orientation_marimekko_rectangle_2dis_2con.mjs @@ -7,13 +7,12 @@ const testSteps = [ config: { channels: { x: ['Country', 'Value 2 (+)'], - y: ['Joy factors', 'Value 3 (+)'], + y: { set: ['Joy factors', 'Value 3 (+)'], align: 'stretch' }, color: 'Joy factors', label: 'Value 2 (+)', lightness: 'Country' }, title: 'Marimekko Chart', - align: 'stretch', orientation: 'horizontal' } }), @@ -23,7 +22,9 @@ const testSteps = [ config: { title: 'Marimekko with Other Orientation', orientation: 'vertical', - label: 'Value 3 (+)' + label: 'Value 3 (+)', + x: { align: 'stretch' }, + y: { align: 'none' } } }) ] diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/01_d-p_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/01_d-p_r-r-r.mjs index 6c05a0631..2f65ea34e 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/01_d-p_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/01_d-p_r-r-r.mjs @@ -26,9 +26,7 @@ const testSteps = [ }, title: 'Bar Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/02_d-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/02_d-p_c-r-c.mjs index 8f0fcc7aa..f75167cdf 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/02_d-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/02_d-p_c-r-c.mjs @@ -37,9 +37,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/03_d-p_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/03_d-p_a-r-a.mjs index 8ae081bdd..aa83568ef 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/03_d-p_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/03_d-p_a-r-a.mjs @@ -27,9 +27,7 @@ const testSteps = [ }, title: 'Coxcomb', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/04_d-p_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/04_d-p_l-r-l.mjs index d3af141d8..f41be57e9 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/04_d-p_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/04_d-p_l-r-l.mjs @@ -27,9 +27,7 @@ const testSteps = [ }, title: 'Coxcomb', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/05_d-p_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/05_d-p_r-c-r.mjs index 5ce8a9e87..e84aec7a0 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/05_d-p_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/05_d-p_r-c-r.mjs @@ -28,8 +28,7 @@ const testSteps = [ }, title: 'Spider Dotplot Fake', geometry: 'circle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/06_d-p_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/06_d-p_c-c-c.mjs index f68452509..53e043c9e 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/06_d-p_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/06_d-p_c-c-c.mjs @@ -53,8 +53,7 @@ const testSteps = [ title: 'Radial Dot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/07_d-p_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/07_d-p_a-c-a.mjs index a8bc8c433..45507facd 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/07_d-p_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/07_d-p_a-c-a.mjs @@ -38,8 +38,7 @@ const testSteps = [ title: 'Scatter plot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/08_d-p_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/08_d-p_l-c-l.mjs index 5b7299b2b..141d51d31 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/08_d-p_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/08_d-p_l-c-l.mjs @@ -38,8 +38,7 @@ const testSteps = [ title: 'Scatter plot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/09_d-p_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/09_d-p_r-a-r.mjs index 50c815ff7..c451911fb 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/09_d-p_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/09_d-p_r-a-r.mjs @@ -27,9 +27,7 @@ const testSteps = [ }, title: 'Radial Area Chart', geometry: 'area', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/10_d-p_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/10_d-p_c-a-c.mjs index b5f95bb89..e3ebc7e24 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/10_d-p_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/10_d-p_c-a-c.mjs @@ -39,8 +39,7 @@ const testSteps = [ }, title: 'Radial Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/11_d-p_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/11_d-p_a-a-a.mjs index 591287d46..fa12632fa 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/11_d-p_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/11_d-p_a-a-a.mjs @@ -38,8 +38,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/12_d-p_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/12_d-p_l-a-l.mjs index 77c48db58..061fc7d2d 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/12_d-p_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/12_d-p_l-a-l.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Radial Stacked Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/13_d-p_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/13_d-p_r-l-r.mjs index 3bad983f5..cd28eacf8 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/13_d-p_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/13_d-p_r-l-r.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Spider Line Fake', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/14_d-p_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/14_d-p_c-l-c.mjs index 9e93f1e49..c65b1fac4 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/14_d-p_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/14_d-p_c-l-c.mjs @@ -39,8 +39,7 @@ const testSteps = [ title: 'Radial Line Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/15_d-p_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/15_d-p_a-l-a.mjs index e0d6907dc..f8b9e5453 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/15_d-p_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/15_d-p_a-l-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Radial Line Chart Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar/16_d-p_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar/16_d-p_l-l-l.mjs index a5f81bc18..de9b84203 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar/16_d-p_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar/16_d-p_l-l-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Spider Line Chart Fake', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/01_d-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/01_d-p_o_r-r-r.mjs index 1dab54132..7706a37ba 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/01_d-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/01_d-p_o_r-r-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/02_d-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/02_d-p_o_c-r-c.mjs index 398846cc6..223e6c8d6 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/02_d-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/02_d-p_o_c-r-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/03_d-p_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/03_d-p_o_a-r-a.mjs index a20aa8c2d..dace556a3 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/03_d-p_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/03_d-p_o_a-r-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/04_d-p_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/04_d-p_o_l-r-l.mjs index 7e2bdc222..7b471dab3 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/04_d-p_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/04_d-p_o_l-r-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/05_d-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/05_d-p_o_r-c-r.mjs index 8d5a5515d..2c1a43c9e 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/05_d-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/05_d-p_o_r-c-r.mjs @@ -55,8 +55,7 @@ const testSteps = [ title: 'Radial Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/06_d-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/06_d-p_o_c-c-c.mjs index 8e07dbd29..dddb82bf8 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/06_d-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/06_d-p_o_c-c-c.mjs @@ -56,8 +56,7 @@ const testSteps = [ title: 'Radial Dot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/07_d-p_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/07_d-p_o_a-c-a.mjs index 135c66d4a..b8d8080e8 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/07_d-p_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/07_d-p_o_a-c-a.mjs @@ -48,8 +48,7 @@ const testSteps = [ title: 'Spider Dot Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/08_d-p_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/08_d-p_o_l-c-l.mjs index a1b418086..8f6cd1a43 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/08_d-p_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/08_d-p_o_l-c-l.mjs @@ -39,8 +39,7 @@ const testSteps = [ title: 'Radial Dot Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/09_d-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/09_d-p_o_r-a-r.mjs index b5c1b1879..d202755b8 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/09_d-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/09_d-p_o_r-a-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/10_d-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/10_d-p_o_c-a-c.mjs index 134d8ecbc..fa713e401 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/10_d-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/10_d-p_o_c-a-c.mjs @@ -38,8 +38,7 @@ const testSteps = [ }, title: 'Radial Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/11_d-p_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/11_d-p_o_a-a-a.mjs index 80389412f..881a66af6 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/11_d-p_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/11_d-p_o_a-a-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/12_d-p_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/12_d-p_o_l-a-l.mjs index b76304b8e..d26b11147 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/12_d-p_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/12_d-p_o_l-a-l.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Radial Stacked Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/13_d-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/13_d-p_o_r-l-r.mjs index 7fda1ddba..a6e9099ff 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/13_d-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/13_d-p_o_r-l-r.mjs @@ -29,8 +29,7 @@ const testSteps = [ title: 'Spider Line Fake', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/14_d-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/14_d-p_o_c-l-c.mjs index 27f736ca4..a6d349726 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/14_d-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/14_d-p_o_c-l-c.mjs @@ -38,8 +38,7 @@ const testSteps = [ }, title: 'Radial Line Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/15_d-p_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/15_d-p_o_a-l-a.mjs index 185898dd5..376d2b769 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/15_d-p_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/15_d-p_o_a-l-a.mjs @@ -28,8 +28,7 @@ const testSteps = [ }, title: 'Radial Line Chart Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/16_d-p_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/16_d-p_o_l-l-l.mjs index 0f59e15b7..7ce846ddf 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/16_d-p_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes-polar_orient/16_d-p_o_l-l-l.mjs @@ -29,8 +29,7 @@ const testSteps = [ title: 'Radial Line Chart Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/02_d-d_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes/02_d-d_c-r-c.mjs index 678e79d7f..10a7efa7a 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/02_d-d_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/02_d-d_c-r-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ y: ['Country', 'Value 2 (+)'] }, title: 'Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/03_d-d_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes/03_d-d_a-r-a.mjs index 9834a0399..b88a284f1 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/03_d-d_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/03_d-d_a-r-a.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/04_d-d_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes/04_d-d_l-r-l.mjs index eb25b8442..715f5eed4 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/04_d-d_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/04_d-d_l-r-l.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/07_d-d_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes/07_d-d_a-c-a.mjs index 5914eaf4f..4f3853cab 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/07_d-d_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/07_d-d_a-c-a.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/08_d-d_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes/08_d-d_l-c-l.mjs index 3656e003f..74d96216c 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/08_d-d_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/08_d-d_l-c-l.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes/12_d-d_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes/12_d-d_l-a-l.mjs index 252d0db6d..0e2cecce3 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes/12_d-d_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes/12_d-d_l-a-l.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/01_d-d_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/01_d-d_o_r-r-r.mjs index 3e717485a..da39d4a8b 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/01_d-d_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/01_d-d_o_r-r-r.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/02_d-d_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/02_d-d_o_c-r-c.mjs index e8eb675b9..4681c4f5a 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/02_d-d_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/02_d-d_o_c-r-c.mjs @@ -51,8 +51,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a.mjs index 52b4221c6..2bdb31d1c 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a_split.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a_split.mjs index eb6920c39..9335aa417 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a_split.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/03_d-d_o_a-r-a_split.mjs @@ -37,11 +37,9 @@ const testSteps = [ { config: { channels: { - y: { range: { max: '100%' } } + y: { range: { max: '100%' }, align: 'center', split: true } }, - title: 'Splitted Area Chart', - align: 'center', - split: true + title: 'Splitted Area Chart' } }, { @@ -61,13 +59,11 @@ const testSteps = [ config: { channels: { x: { set: ['Value 2 (+)', 'Year'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], align: 'none', split: false }, color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }, { @@ -95,12 +91,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year'] }, - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], align: 'center', split: true } }, title: 'Splitted Area Chart', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' } }, { @@ -127,13 +121,11 @@ const testSteps = [ { config: { channels: { - y: { range: { max: '110%' } } + y: { range: { max: '110%' }, align: 'none', split: false } }, title: 'Stacked Area Chart', geometry: 'area', - legend: null, - align: 'none', - split: false + legend: null } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l.mjs index eda1bc224..b2295452d 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs index 21d9e388b..0098bcf78 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs @@ -21,11 +21,9 @@ const testSteps = [ { config: { channels: { - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], split: true } }, - title: 'Stacked Line Chart', - // align: 'center', - split: true + title: 'Stacked Line Chart' } }, { @@ -53,13 +51,11 @@ const testSteps = [ config: { channels: { x: { set: ['Value 2 (+)', 'Year'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], split: false }, color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - // align: 'none', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/05_d-d_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/05_d-d_o_r-c-r.mjs index 1a0538aad..3f99bf8a9 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/05_d-d_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/05_d-d_o_r-c-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Scatter plot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/06_d-d_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/06_d-d_o_c-c-c.mjs index a28666770..dc9ed25de 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/06_d-d_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/06_d-d_o_c-c-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/07_d-d_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/07_d-d_o_a-c-a.mjs index ec4657f68..ba024bac1 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/07_d-d_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/07_d-d_o_a-c-a.mjs @@ -28,8 +28,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/08_d-d_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/08_d-d_o_l-c-l.mjs index 95184db02..bd2b4dd05 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/08_d-d_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/08_d-d_o_l-c-l.mjs @@ -38,8 +38,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/09_d-d_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/09_d-d_o_r-a-r.mjs index 0517a7f3a..7162fb9c5 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/09_d-d_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/09_d-d_o_r-a-r.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/10_d-d_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/10_d-d_o_c-a-c.mjs index 3396bb28f..f93a795f0 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/10_d-d_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/10_d-d_o_c-a-c.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/11_d-d_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/11_d-d_o_a-a-a.mjs index 857039645..8c8005f31 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/11_d-d_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/11_d-d_o_a-a-a.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/12_d-d_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/12_d-d_o_l-a-l.mjs index 1be0e686e..6d8080e52 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/12_d-d_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/12_d-d_o_l-a-l.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/13_d-d_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/13_d-d_o_r-l-r.mjs index 25c32f297..ba014c036 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/13_d-d_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/13_d-d_o_r-l-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Spider Line Fake', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/14_d-d_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/14_d-d_o_c-l-c.mjs index ae05c448c..e97cdf8e9 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/14_d-d_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/14_d-d_o_c-l-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Vertical', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/15_d-d_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/15_d-d_o_a-l-a.mjs index be62d555d..a0a757daa 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/15_d-d_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/15_d-d_o_a-l-a.mjs @@ -43,8 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/descartes_orientation/16_d-d_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming/descartes_orientation/16_d-d_o_l-l-l.mjs index 33f5e7a43..ae4aaad5d 100755 --- a/test/e2e/test_cases/ww_animTiming/descartes_orientation/16_d-d_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/descartes_orientation/16_d-d_o_l-l-l.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Line Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/02_p-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/polar/02_p-p_c-r-c.mjs index 487a8413c..a55556468 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/02_p-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/02_p-p_c-r-c.mjs @@ -53,8 +53,7 @@ const testSteps = [ y: { set: ['Country', 'Value 2 (+)'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/03_p-p_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/polar/03_p-p_a-r-a.mjs index 9e4143c30..6276492a6 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/03_p-p_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/03_p-p_a-r-a.mjs @@ -27,9 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/04_p-p_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/polar/04_p-p_l-r-l.mjs index 65c5818e3..9061e795b 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/04_p-p_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/04_p-p_l-r-l.mjs @@ -27,9 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/07_p-p_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/polar/07_p-p_a-c-a.mjs index 079fce761..8a18390d9 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/07_p-p_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/07_p-p_a-c-a.mjs @@ -37,9 +37,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/08_p-p_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/polar/08_p-p_l-c-l.mjs index b9c886cfe..5a56c9256 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/08_p-p_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/08_p-p_l-c-l.mjs @@ -37,9 +37,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Polar Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar/12_p-p_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/polar/12_p-p_l-a-l.mjs index 43a2e3193..2ef147625 100755 --- a/test/e2e/test_cases/ww_animTiming/polar/12_p-p_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar/12_p-p_l-a-l.mjs @@ -27,9 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Polar Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/01_p-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/01_p-p_o_r-r-r.mjs index 7f7ceb324..2da2b9fc8 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/01_p-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/01_p-p_o_r-r-r.mjs @@ -44,8 +44,6 @@ const testSteps = [ }, title: 'Radial', geometry: 'rectangle' - // orientation: 'horizontal', - // split: false, } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/02_p-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/02_p-p_o_c-r-c.mjs index 01d2b101b..96d5c9bb4 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/02_p-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/02_p-p_o_c-r-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ }, title: 'Stacked Coxcomb', geometry: 'rectangle', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/03_p-p_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/03_p-p_o_a-r-a.mjs index ef411a36a..d98454c84 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/03_p-p_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/03_p-p_o_a-r-a.mjs @@ -27,9 +27,7 @@ const testSteps = [ color: 'Country' }, title: 'Radial Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/04_p-p_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/04_p-p_o_l-r-l.mjs index 6dd2261a2..d0c6c7dfb 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/04_p-p_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/04_p-p_o_l-r-l.mjs @@ -27,9 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Radial Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/05_p-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/05_p-p_o_r-c-r.mjs index 587fcb51a..09c40a2e9 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/05_p-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/05_p-p_o_r-c-r.mjs @@ -55,8 +55,7 @@ const testSteps = [ }, title: 'Radial Dot plot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/06_p-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/06_p-p_o_c-c-c.mjs index ee4661f15..f9da6bb5f 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/06_p-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/06_p-p_o_c-c-c.mjs @@ -55,8 +55,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/07_p-p_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/07_p-p_o_a-c-a.mjs index 18c1f1833..1403b2af0 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/07_p-p_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/07_p-p_o_a-c-a.mjs @@ -49,8 +49,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/08_p-p_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/08_p-p_o_l-c-l.mjs index b3777fa40..59b00102e 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/08_p-p_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/08_p-p_o_l-c-l.mjs @@ -38,8 +38,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Radial Line Chart Vertical', - geometry: 'circle', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/09_p-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/09_p-p_o_r-a-r.mjs index be545ea06..cb253140c 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/09_p-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/09_p-p_o_r-a-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: 'Country' }, title: 'Stacked Area Chart', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/10_p-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/10_p-p_o_c-a-c.mjs index acfebcdc0..82840bc2c 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/10_p-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/10_p-p_o_c-a-c.mjs @@ -38,8 +38,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/11_p-p_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/11_p-p_o_a-a-a.mjs index 21d3c1194..5bd864070 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/11_p-p_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/11_p-p_o_a-a-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/12_p-p_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/12_p-p_o_l-a-l.mjs index 21583edba..1f57bee22 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/12_p-p_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/12_p-p_o_l-a-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/13_p-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/13_p-p_o_r-l-r.mjs index 5638ff334..4cb57fbd9 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/13_p-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/13_p-p_o_r-l-r.mjs @@ -28,8 +28,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Spider Line Fake', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/14_p-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/14_p-p_o_c-l-c.mjs index 8d6c61e2b..77bb6edb7 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/14_p-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/14_p-p_o_c-l-c.mjs @@ -38,8 +38,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Vertical', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/15_p-p_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/15_p-p_o_a-l-a.mjs index 1ae20ab4f..aebe47c6b 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/15_p-p_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/15_p-p_o_a-l-a.mjs @@ -28,8 +28,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'line', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/polar_orientation/16_p-p_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming/polar_orientation/16_p-p_o_l-l-l.mjs index 7cd0a57fc..62189198b 100755 --- a/test/e2e/test_cases/ww_animTiming/polar_orientation/16_p-p_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming/polar_orientation/16_p-p_o_l-l-l.mjs @@ -29,8 +29,7 @@ const testSteps = [ }, title: 'Line Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/01_w-d_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/01_w-d_r-r-r.mjs index 9d9de992e..b5b6262a7 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/01_w-d_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/01_w-d_r-r-r.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/02_w-d_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/02_w-d_c-r-c.mjs index 7a82c31c3..6d9ca8bca 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/02_w-d_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/02_w-d_c-r-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/05_w-d_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/05_w-d_r-c-r.mjs index e0502c899..13871735f 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/05_w-d_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/05_w-d_r-c-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ color: { set: ['Joy factors'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/06_w-d_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/06_w-d_c-c-c.mjs index 507e3eace..38c253922 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/06_w-d_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/06_w-d_c-c-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/09_w-d_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/09_w-d_r-a-r.mjs index 4e7c6e194..e8f274819 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/09_w-d_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/09_w-d_r-a-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/10_w-d_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/10_w-d_c-a-c.mjs index 230749cf6..b4551400f 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/10_w-d_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/10_w-d_c-a-c.mjs @@ -43,9 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/13_w-d_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/13_w-d_r-l-r.mjs index 6d9289c85..ff9015269 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/13_w-d_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/13_w-d_r-l-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Line Chart', geometry: 'line', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes/14_w-d_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes/14_w-d_c-l-c.mjs index ebb48277d..9761af0b5 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes/14_w-d_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes/14_w-d_c-l-c.mjs @@ -43,9 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Chart', - geometry: 'line', - // orientation: 'horizontal', - split: false + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/01_w-d_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/01_w-d_o_r-r-r.mjs index 9a0a8c8f5..4285cea2e 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/01_w-d_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/01_w-d_o_r-r-r.mjs @@ -43,9 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/02_w-d_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/02_w-d_o_c-r-c.mjs index 8d013930a..a190e3f1d 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/02_w-d_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/02_w-d_o_c-r-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/05_w-d_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/05_w-d_o_r-c-r.mjs index 26d910678..1407aed34 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/05_w-d_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/05_w-d_o_r-c-r.mjs @@ -44,9 +44,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/06_w-d_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/06_w-d_o_c-c-c.mjs index 69669449e..c09cbd9bd 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/06_w-d_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/06_w-d_o_c-c-c.mjs @@ -44,9 +44,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/09_w-d_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/09_w-d_o_r-a-r.mjs index d0f11520d..5da168d5c 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/09_w-d_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/09_w-d_o_r-a-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'area', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/10_w-d_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/10_w-d_o_c-a-c.mjs index 707dd5ea0..db569defc 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/10_w-d_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/10_w-d_o_c-a-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/13_w-d_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/13_w-d_o_r-l-r.mjs index 4186fede0..43a439399 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/13_w-d_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/13_w-d_o_r-l-r.mjs @@ -45,8 +45,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/14_w-d_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/14_w-d_o_c-l-c.mjs index 335fb3026..3ddcb88ad 100755 --- a/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/14_w-d_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-descartes_orientation/14_w-d_o_c-l-c.mjs @@ -45,8 +45,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/01_w-p_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/01_w-p_r-r-r.mjs index fae53abcb..9ead76b7b 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/01_w-p_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/01_w-p_r-r-r.mjs @@ -43,9 +43,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/02_w-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/02_w-p_c-r-c.mjs index 03bc786f3..3475eb7b6 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/02_w-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/02_w-p_c-r-c.mjs @@ -43,9 +43,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/05_w-p_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/05_w-p_r-c-r.mjs index f757a292c..02de9fa7a 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/05_w-p_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/05_w-p_r-c-r.mjs @@ -45,9 +45,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/06_w-p_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/06_w-p_c-c-c.mjs index f015c6656..1e06ec45b 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/06_w-p_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/06_w-p_c-c-c.mjs @@ -55,9 +55,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/09_w-p_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/09_w-p_r-a-r.mjs index 089cba18c..c6d2c8d4c 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/09_w-p_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/09_w-p_r-a-r.mjs @@ -45,8 +45,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'area', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/10_w-p_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/10_w-p_c-a-c.mjs index 8f1adb63c..1a920216d 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/10_w-p_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/10_w-p_c-a-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/13_w-p_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/13_w-p_r-l-r.mjs index f7aaebff2..87f9c135a 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/13_w-p_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/13_w-p_r-l-r.mjs @@ -45,8 +45,7 @@ const testSteps = [ title: 'Line Chart', geometry: 'line', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar/14_w-p_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar/14_w-p_c-l-c.mjs index 492bca054..758526019 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar/14_w-p_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar/14_w-p_c-l-c.mjs @@ -44,9 +44,7 @@ const testSteps = [ }, title: 'Line Chart', geometry: 'line', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/01_w-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/01_w-p_o_r-r-r.mjs index 7f5fd35d6..fc14a0328 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/01_w-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/01_w-p_o_r-r-r.mjs @@ -44,9 +44,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/02_w-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/02_w-p_o_c-r-c.mjs index 4743e3ef2..c0b270a9d 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/02_w-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/02_w-p_o_c-r-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/05_w-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/05_w-p_o_r-c-r.mjs index 39760290f..adfe9d496 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/05_w-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/05_w-p_o_r-c-r.mjs @@ -55,9 +55,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/06_w-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/06_w-p_o_c-c-c.mjs index ec23ac816..13e61eac6 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/06_w-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/06_w-p_o_c-c-c.mjs @@ -55,9 +55,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/09_w-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/09_w-p_o_r-a-r.mjs index 8a0b42e2f..489c9a31a 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/09_w-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/09_w-p_o_r-a-r.mjs @@ -45,8 +45,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/10_w-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/10_w-p_o_c-a-c.mjs index 9cfff9db6..7e138c152 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/10_w-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/10_w-p_o_c-a-c.mjs @@ -55,8 +55,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/13_w-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/13_w-p_o_r-l-r.mjs index 5772992a6..1da03e98d 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/13_w-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/13_w-p_o_r-l-r.mjs @@ -45,8 +45,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/14_w-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/14_w-p_o_c-l-c.mjs index b4d75b7c7..d6a53d1ea 100755 --- a/test/e2e/test_cases/ww_animTiming/without-polar_orientation/14_w-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without-polar_orientation/14_w-p_o_c-l-c.mjs @@ -55,8 +55,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_animTiming/without/02_w-w_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming/without/02_w-w_c-r-c.mjs index 77abd8973..7623e7f8f 100755 --- a/test/e2e/test_cases/ww_animTiming/without/02_w-w_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming/without/02_w-w_c-r-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ noop: { set: ['Year'] } }, title: 'Treemap', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }, { diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/02_d-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/02_d-p_c-r-c.mjs index a89918ee3..9ba322916 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/02_d-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/02_d-p_c-r-c.mjs @@ -26,9 +26,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/03_d-p_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/03_d-p_a-r-a.mjs index af32f3fde..746fb1e72 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/03_d-p_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/03_d-p_a-r-a.mjs @@ -26,9 +26,7 @@ const testSteps = [ }, title: 'Coxcomb', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/04_d-p_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/04_d-p_l-r-l.mjs index 54cc3d31e..a4414e7d3 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/04_d-p_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/04_d-p_l-r-l.mjs @@ -26,9 +26,7 @@ const testSteps = [ }, title: 'Coxcomb', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/05_d-p_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/05_d-p_r-c-r.mjs index 599460188..070d7ef15 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/05_d-p_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/05_d-p_r-c-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Spider Dotplot Fake', geometry: 'circle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/06_d-p_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/06_d-p_c-c-c.mjs index 9bcf55c3b..29194968f 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/06_d-p_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/06_d-p_c-c-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ title: 'Radial Dot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/07_d-p_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/07_d-p_a-c-a.mjs index 3c5538eef..284575dc6 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/07_d-p_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/07_d-p_a-c-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ title: 'Scatter plot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/08_d-p_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/08_d-p_l-c-l.mjs index 75b3f7e2f..173d10cec 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/08_d-p_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/08_d-p_l-c-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ title: 'Scatter plot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/09_d-p_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/09_d-p_r-a-r.mjs index 127a36cad..d6840cacd 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/09_d-p_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/09_d-p_r-a-r.mjs @@ -26,9 +26,7 @@ const testSteps = [ }, title: 'Radial Area Chart', geometry: 'area', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/10_d-p_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/10_d-p_c-a-c.mjs index 836ef3ad7..7cd896509 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/10_d-p_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/10_d-p_c-a-c.mjs @@ -28,8 +28,7 @@ const testSteps = [ }, title: 'Radial Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/11_d-p_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/11_d-p_a-a-a.mjs index ae31de2a3..8dd463d8e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/11_d-p_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/11_d-p_a-a-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/12_d-p_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/12_d-p_l-a-l.mjs index 08fd02a9e..5446bbc95 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/12_d-p_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/12_d-p_l-a-l.mjs @@ -42,8 +42,7 @@ const testSteps = [ }, title: 'Radial Stacked Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/13_d-p_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/13_d-p_r-l-r.mjs index e989c5338..24bfdbc9f 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/13_d-p_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/13_d-p_r-l-r.mjs @@ -25,8 +25,7 @@ const testSteps = [ }, title: 'Spider Line Fake', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/14_d-p_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/14_d-p_c-l-c.mjs index cdd2f4f23..69859acec 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/14_d-p_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/14_d-p_c-l-c.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Radial Line Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/15_d-p_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/15_d-p_a-l-a.mjs index 37cd11372..4161ee7b5 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/15_d-p_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/15_d-p_a-l-a.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Radial Line Chart Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/16_d-p_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/16_d-p_l-l-l.mjs index 826117382..157d53420 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/16_d-p_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar/16_d-p_l-l-l.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Spider Line Chart Fake', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/01_d-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/01_d-p_o_r-r-r.mjs index 56fb8e8a1..ab5ee5a94 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/01_d-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/01_d-p_o_r-r-r.mjs @@ -42,8 +42,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/02_d-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/02_d-p_o_c-r-c.mjs index a0ecafd80..d7e5d4e1f 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/02_d-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/02_d-p_o_c-r-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/03_d-p_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/03_d-p_o_a-r-a.mjs index 12b76cb18..255f5c80b 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/03_d-p_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/03_d-p_o_a-r-a.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/04_d-p_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/04_d-p_o_l-r-l.mjs index 7543a7a1c..a2c654cfc 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/04_d-p_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/04_d-p_o_l-r-l.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Radial Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/05_d-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/05_d-p_o_r-c-r.mjs index 86f25e6da..25cdf31ae 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/05_d-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/05_d-p_o_r-c-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ title: 'Radial Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/06_d-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/06_d-p_o_c-c-c.mjs index 1ae5ce238..375fce3df 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/06_d-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/06_d-p_o_c-c-c.mjs @@ -45,8 +45,7 @@ const testSteps = [ title: 'Radial Dot', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/07_d-p_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/07_d-p_o_a-c-a.mjs index ea93310b7..b91c47d92 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/07_d-p_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/07_d-p_o_a-c-a.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Spider Dot Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/08_d-p_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/08_d-p_o_l-c-l.mjs index aa6841104..befb0f783 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/08_d-p_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/08_d-p_o_l-c-l.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Radial Dot Chart', geometry: 'circle', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/09_d-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/09_d-p_o_r-a-r.mjs index 921c05ac5..bf9149db8 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/09_d-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/09_d-p_o_r-a-r.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/10_d-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/10_d-p_o_c-a-c.mjs index b0c237ca2..860e2fbfc 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/10_d-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/10_d-p_o_c-a-c.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Radial Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/11_d-p_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/11_d-p_o_a-a-a.mjs index d1e8c0141..e1c9dc84e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/11_d-p_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/11_d-p_o_a-a-a.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/12_d-p_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/12_d-p_o_l-a-l.mjs index 1f68391c2..29a5fd535 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/12_d-p_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/12_d-p_o_l-a-l.mjs @@ -26,8 +26,7 @@ const testSteps = [ }, title: 'Radial Stacked Area Chart Vertical', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/13_d-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/13_d-p_o_r-l-r.mjs index 27a9d45b8..e4a0bb415 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/13_d-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/13_d-p_o_r-l-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Spider Line Fake', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/14_d-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/14_d-p_o_c-l-c.mjs index 768653a0d..7d14260e1 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/14_d-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/14_d-p_o_c-l-c.mjs @@ -37,8 +37,7 @@ const testSteps = [ }, title: 'Radial Line Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/15_d-p_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/15_d-p_o_a-l-a.mjs index e76a67006..9447d140e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/15_d-p_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/15_d-p_o_a-l-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Radial Line Chart Vertical', geometry: 'line', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/16_d-p_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/16_d-p_o_l-l-l.mjs index a8a33e12f..5cf55baad 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/16_d-p_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes-polar_orient/16_d-p_o_l-l-l.mjs @@ -28,8 +28,7 @@ const testSteps = [ title: 'Radial Line Chart Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/02_d-d_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/02_d-d_c-r-c.mjs index 49e3a43ca..d8be26997 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/02_d-d_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/02_d-d_c-r-c.mjs @@ -41,9 +41,7 @@ const testSteps = [ y: ['Country', 'Value 2 (+)'] }, title: 'Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/03_d-d_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/03_d-d_a-r-a.mjs index 739ce8c9f..9b24227cb 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/03_d-d_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/03_d-d_a-r-a.mjs @@ -25,9 +25,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/04_d-d_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/04_d-d_l-r-l.mjs index 4495fe6e5..e4b4c7e13 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/04_d-d_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/04_d-d_l-r-l.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/07_d-d_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/07_d-d_a-c-a.mjs index 847be3a37..8edeab349 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/07_d-d_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/07_d-d_a-c-a.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/08_d-d_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/08_d-d_l-c-l.mjs index 35fdf96cf..8e0731230 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/08_d-d_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/08_d-d_l-c-l.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/12_d-d_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/12_d-d_l-a-l.mjs index a26306efa..457a85d97 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes/12_d-d_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes/12_d-d_l-a-l.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/01_d-d_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/01_d-d_o_r-r-r.mjs index f3d87d1e3..3651e6fcd 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/01_d-d_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/01_d-d_o_r-r-r.mjs @@ -41,8 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/02_d-d_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/02_d-d_o_c-r-c.mjs index 908031f46..3650456eb 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/02_d-d_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/02_d-d_o_c-r-c.mjs @@ -42,8 +42,7 @@ const testSteps = [ }, title: 'Bar Chart', geometry: 'rectangle', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a.mjs index 20fa9b4a0..6038ef3f7 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a.mjs @@ -41,8 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a_split.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a_split.mjs index f3eaa42ff..1420cbee0 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a_split.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/03_d-d_o_a-r-a_split.mjs @@ -36,11 +36,9 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { range: { max: '100%' } } + y: { range: { max: '100%' }, align: 'center', split: true } }, - title: 'Splitted Area Chart', - align: 'center', - split: true + title: 'Splitted Area Chart' } }), @@ -49,13 +47,11 @@ const testSteps = [ config: { channels: { x: { set: ['Value 2 (+)', 'Year'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], align: 'none', split: false }, color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }), @@ -64,12 +60,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year'] }, - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], align: 'center', split: true } }, title: 'Splitted Area Chart', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' } }), @@ -77,13 +71,11 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { range: { max: '110%' } } + y: { range: { max: '110%' }, align: 'none', split: false } }, title: 'Stacked Area Chart', geometry: 'area', - legend: null, - align: 'none', - split: false + legend: null } }) ] diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l.mjs index 27060671f..6dbb1bf3a 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l.mjs @@ -25,8 +25,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs index 6c70a9517..4c6f9d470 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/04_d-d_o_l-r-l_stacked.mjs @@ -20,11 +20,9 @@ const testSteps = [ chart.animate({ config: { channels: { - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], split: true } }, - title: 'Stacked Line Chart', - // align: 'center', - split: true + title: 'Stacked Line Chart' } }), @@ -33,13 +31,11 @@ const testSteps = [ config: { channels: { x: { set: ['Value 2 (+)', 'Year'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], split: false }, color: { set: ['Country'] } }, title: 'Bar Chart', - geometry: 'rectangle', - // align: 'none', - split: false + geometry: 'rectangle' } }) ] diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/05_d-d_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/05_d-d_o_r-c-r.mjs index a14fc0ddf..f25822ce8 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/05_d-d_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/05_d-d_o_r-c-r.mjs @@ -42,8 +42,7 @@ const testSteps = [ }, title: 'Scatter plot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/06_d-d_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/06_d-d_o_c-c-c.mjs index add42518c..1a971ff75 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/06_d-d_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/06_d-d_o_c-c-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/07_d-d_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/07_d-d_o_a-c-a.mjs index c31c01741..f30bbc521 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/07_d-d_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/07_d-d_o_a-c-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/08_d-d_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/08_d-d_o_l-c-l.mjs index e97efb573..5adb5673c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/08_d-d_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/08_d-d_o_l-c-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/09_d-d_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/09_d-d_o_r-a-r.mjs index f81963cc9..d1ddda149 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/09_d-d_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/09_d-d_o_r-a-r.mjs @@ -41,8 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/10_d-d_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/10_d-d_o_c-a-c.mjs index 38ce55f98..cf066e2ba 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/10_d-d_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/10_d-d_o_c-a-c.mjs @@ -27,8 +27,7 @@ const testSteps = [ }, title: 'Area Chart Vertical', geometry: 'area', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/11_d-d_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/11_d-d_o_a-a-a.mjs index 0db25db33..410bd11b0 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/11_d-d_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/11_d-d_o_a-a-a.mjs @@ -41,8 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/12_d-d_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/12_d-d_o_l-a-l.mjs index 6c32a9bd6..2f7a80e47 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/12_d-d_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/12_d-d_o_l-a-l.mjs @@ -25,8 +25,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/13_d-d_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/13_d-d_o_r-l-r.mjs index bfbf2ffe4..22cdb2ef4 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/13_d-d_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/13_d-d_o_r-l-r.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Spider Line Fake', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/14_d-d_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/14_d-d_o_c-l-c.mjs index 66368ee5f..7e6caaac8 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/14_d-d_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/14_d-d_o_c-l-c.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Vertical', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/15_d-d_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/15_d-d_o_a-l-a.mjs index 2d0a2cdfd..92a047678 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/15_d-d_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/15_d-d_o_a-l-a.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/16_d-d_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/16_d-d_o_l-l-l.mjs index 194394fa0..1ed923b4c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/16_d-d_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/descartes_orientation/16_d-d_o_l-l-l.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Line Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/02_p-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/02_p-p_c-r-c.mjs index d06c2feea..a5c792971 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/02_p-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/02_p-p_c-r-c.mjs @@ -42,8 +42,7 @@ const testSteps = [ y: { set: ['Country', 'Value 2 (+)'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/03_p-p_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/03_p-p_a-r-a.mjs index 1b56420a7..af60dc385 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/03_p-p_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/03_p-p_a-r-a.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/04_p-p_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/04_p-p_l-r-l.mjs index 06abf7e1b..e5293e27a 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/04_p-p_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/04_p-p_l-r-l.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Coxcomb', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/07_p-p_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/07_p-p_a-c-a.mjs index f05966f8a..1c261fc57 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/07_p-p_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/07_p-p_a-c-a.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/08_p-p_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/08_p-p_l-c-l.mjs index 7a0ebe0e6..24dc94253 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/08_p-p_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/08_p-p_l-c-l.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Polar Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar/12_p-p_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar/12_p-p_l-a-l.mjs index 0e408f215..5d107e6f7 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar/12_p-p_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar/12_p-p_l-a-l.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Polar Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/01_p-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/01_p-p_o_r-r-r.mjs index 091cfabd5..9f658ac2b 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/01_p-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/01_p-p_o_r-r-r.mjs @@ -43,8 +43,6 @@ const testSteps = [ }, title: 'Radial', geometry: 'rectangle' - // orientation: 'horizontal', - // split: false, } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/02_p-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/02_p-p_o_c-r-c.mjs index 21cb81b5a..86cb16f8c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/02_p-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/02_p-p_o_c-r-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Stacked Coxcomb', geometry: 'rectangle', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/03_p-p_o_a-r-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/03_p-p_o_a-r-a.mjs index 8d05e42a3..adfb9ed4e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/03_p-p_o_a-r-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/03_p-p_o_a-r-a.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: 'Country' }, title: 'Radial Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/04_p-p_o_l-r-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/04_p-p_o_l-r-l.mjs index 53fea2f1b..706553755 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/04_p-p_o_l-r-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/04_p-p_o_l-r-l.mjs @@ -26,9 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Radial Bar Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/05_p-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/05_p-p_o_r-c-r.mjs index d94fe962c..126973e1b 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/05_p-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/05_p-p_o_r-c-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Radial Dot plot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/06_p-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/06_p-p_o_c-c-c.mjs index cbc097c4d..70ed0da92 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/06_p-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/06_p-p_o_c-c-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/07_p-p_o_a-c-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/07_p-p_o_a-c-a.mjs index eda45153f..7bf0bc5e2 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/07_p-p_o_a-c-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/07_p-p_o_a-c-a.mjs @@ -37,8 +37,7 @@ const testSteps = [ }, title: 'Dotplot', geometry: 'circle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/08_p-p_o_l-c-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/08_p-p_o_l-c-l.mjs index 80f3fc265..45b1a4f8e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/08_p-p_o_l-c-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/08_p-p_o_l-c-l.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Radial Line Chart Vertical', - geometry: 'circle', - split: false + geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/09_p-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/09_p-p_o_r-a-r.mjs index a40efe820..b127c17f2 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/09_p-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/09_p-p_o_r-a-r.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: 'Country' }, title: 'Stacked Area Chart', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/10_p-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/10_p-p_o_c-a-c.mjs index 565e742b0..a0d557590 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/10_p-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/10_p-p_o_c-a-c.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/11_p-p_o_a-a-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/11_p-p_o_a-a-a.mjs index a6629004a..1fdd1557e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/11_p-p_o_a-a-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/11_p-p_o_a-a-a.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/12_p-p_o_l-a-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/12_p-p_o_l-a-l.mjs index 6c4bb96d9..996315bc0 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/12_p-p_o_l-a-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/12_p-p_o_l-a-l.mjs @@ -26,8 +26,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'area', - split: false + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/13_p-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/13_p-p_o_r-l-r.mjs index 9e9e98d2d..7b9dd19b7 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/13_p-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/13_p-p_o_r-l-r.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Spider Line Fake', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/14_p-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/14_p-p_o_c-l-c.mjs index 3faf5b585..898636106 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/14_p-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/14_p-p_o_c-l-c.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Vertical', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/15_p-p_o_a-l-a.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/15_p-p_o_a-l-a.mjs index 663e8af19..3065bcdd4 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/15_p-p_o_a-l-a.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/15_p-p_o_a-l-a.mjs @@ -27,8 +27,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart Vertical', - geometry: 'line', - split: false + geometry: 'line' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/16_p-p_o_l-l-l.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/16_p-p_o_l-l-l.mjs index e8573e23a..bad3edc2c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/16_p-p_o_l-l-l.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/polar_orientation/16_p-p_o_l-l-l.mjs @@ -28,8 +28,7 @@ const testSteps = [ }, title: 'Line Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/01_w-d_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/01_w-d_r-r-r.mjs index 0ccb580b5..d050a5a67 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/01_w-d_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/01_w-d_r-r-r.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/02_w-d_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/02_w-d_c-r-c.mjs index 9778d344b..de1a5677e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/02_w-d_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/02_w-d_c-r-c.mjs @@ -41,9 +41,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/05_w-d_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/05_w-d_r-c-r.mjs index 5d01309a9..3af1bc51f 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/05_w-d_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/05_w-d_r-c-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ color: { set: ['Joy factors'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - split: false + geometry: 'circle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/06_w-d_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/06_w-d_c-c-c.mjs index a28bb132d..e2eaa38a7 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/06_w-d_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/06_w-d_c-c-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - split: false + geometry: 'circle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/09_w-d_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/09_w-d_r-a-r.mjs index 19e89db37..03b593a72 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/09_w-d_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/09_w-d_r-a-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/10_w-d_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/10_w-d_c-a-c.mjs index 821a26a32..8fbc97202 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/10_w-d_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/10_w-d_c-a-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Area Chart', - geometry: 'area', - // orientation: 'horizontal', - split: false + geometry: 'area' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/13_w-d_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/13_w-d_r-l-r.mjs index 06a7b42b3..f3dc9178e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/13_w-d_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/13_w-d_r-l-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Line Chart', geometry: 'line', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/14_w-d_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/14_w-d_c-l-c.mjs index e2d347b58..cf83bc9f1 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/14_w-d_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes/14_w-d_c-l-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Line Chart', - geometry: 'line', - // orientation: 'horizontal', - split: false + geometry: 'line' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/01_w-d_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/01_w-d_o_r-r-r.mjs index 66b32d836..96772bc28 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/01_w-d_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/01_w-d_o_r-r-r.mjs @@ -42,9 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/02_w-d_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/02_w-d_o_c-r-c.mjs index c63e44382..62b9e1526 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/02_w-d_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/02_w-d_o_c-r-c.mjs @@ -42,8 +42,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Stacked Column Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/05_w-d_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/05_w-d_o_r-c-r.mjs index 3c6a4dfe5..7ccfcad82 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/05_w-d_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/05_w-d_o_r-c-r.mjs @@ -43,9 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/06_w-d_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/06_w-d_o_c-c-c.mjs index 23fb9934e..f2d5e25bb 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/06_w-d_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/06_w-d_o_c-c-c.mjs @@ -43,9 +43,7 @@ const testSteps = [ color: { set: ['Country'] } }, title: 'Dotplot vs. Scatter plot', - geometry: 'circle', - // orientation: 'horizontal', - split: false + geometry: 'circle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/09_w-d_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/09_w-d_o_r-a-r.mjs index 43d718ce3..5a392f1dc 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/09_w-d_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/09_w-d_o_r-a-r.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'area', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/10_w-d_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/10_w-d_o_c-a-c.mjs index 2101e5532..b6c2d3328 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/10_w-d_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/10_w-d_o_c-a-c.mjs @@ -43,8 +43,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/13_w-d_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/13_w-d_o_r-l-r.mjs index 43e96c1bf..b9695b515 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/13_w-d_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/13_w-d_o_r-l-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Stacked Area Chart Vertical', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/14_w-d_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/14_w-d_o_c-l-c.mjs index 111848ec2..6ee7dc071 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/14_w-d_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-descartes_orientation/14_w-d_o_c-l-c.mjs @@ -44,8 +44,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'line', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/01_w-p_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/01_w-p_r-r-r.mjs index d3527729f..2d0c54b0c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/01_w-p_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/01_w-p_r-r-r.mjs @@ -42,9 +42,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/02_w-p_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/02_w-p_c-r-c.mjs index 70b5721ae..e4ee6b70b 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/02_w-p_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/02_w-p_c-r-c.mjs @@ -42,9 +42,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/05_w-p_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/05_w-p_r-c-r.mjs index 595d8314b..d7f511190 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/05_w-p_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/05_w-p_r-c-r.mjs @@ -44,9 +44,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/06_w-p_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/06_w-p_c-c-c.mjs index 93cda5d1f..48d9bdb90 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/06_w-p_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/06_w-p_c-c-c.mjs @@ -54,9 +54,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/09_w-p_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/09_w-p_r-a-r.mjs index fb41c6556..a7bd10c30 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/09_w-p_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/09_w-p_r-a-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'area', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/10_w-p_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/10_w-p_c-a-c.mjs index 218109471..3d32ea6bc 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/10_w-p_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/10_w-p_c-a-c.mjs @@ -53,8 +53,7 @@ const testSteps = [ }, title: 'Stacked Area Chart', geometry: 'area', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/13_w-p_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/13_w-p_r-l-r.mjs index 7c584761b..b725dc4f3 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/13_w-p_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/13_w-p_r-l-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ title: 'Line Chart', geometry: 'line', coordSystem: 'polar', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/14_w-p_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/14_w-p_c-l-c.mjs index aecbf15c4..cf43b468b 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/14_w-p_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar/14_w-p_c-l-c.mjs @@ -43,9 +43,7 @@ const testSteps = [ }, title: 'Line Chart', geometry: 'line', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/01_w-p_o_r-r-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/01_w-p_o_r-r-r.mjs index c9ab5b720..d294044d8 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/01_w-p_o_r-r-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/01_w-p_o_r-r-r.mjs @@ -43,9 +43,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/02_w-p_o_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/02_w-p_o_c-r-c.mjs index 36eac36c8..cb37e3a4e 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/02_w-p_o_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/02_w-p_o_c-r-c.mjs @@ -53,8 +53,7 @@ const testSteps = [ }, title: 'Stacked Column Chart', geometry: 'rectangle', - coordSystem: 'polar', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/05_w-p_o_r-c-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/05_w-p_o_r-c-r.mjs index b015092b3..a69614513 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/05_w-p_o_r-c-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/05_w-p_o_r-c-r.mjs @@ -54,9 +54,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/06_w-p_o_c-c-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/06_w-p_o_c-c-c.mjs index bcc8655a9..ef9ac7b67 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/06_w-p_o_c-c-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/06_w-p_o_c-c-c.mjs @@ -54,9 +54,7 @@ const testSteps = [ }, title: 'Dotplot vs. Scatter plot', geometry: 'circle', - coordSystem: 'polar', - // orientation: 'horizontal', - split: false + coordSystem: 'polar' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/09_w-p_o_r-a-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/09_w-p_o_r-a-r.mjs index 3c748f791..d40dc84b2 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/09_w-p_o_r-a-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/09_w-p_o_r-a-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/10_w-p_o_c-a-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/10_w-p_o_c-a-c.mjs index e9d70c620..e3ff9dd3c 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/10_w-p_o_c-a-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/10_w-p_o_c-a-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'area', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/13_w-p_o_r-l-r.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/13_w-p_o_r-l-r.mjs index e16752346..7b0290f58 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/13_w-p_o_r-l-r.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/13_w-p_o_r-l-r.mjs @@ -44,8 +44,7 @@ const testSteps = [ title: 'Stacked Area Chart Vertical', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/14_w-p_o_c-l-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/14_w-p_o_c-l-c.mjs index 4a37371eb..54cff45de 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/14_w-p_o_c-l-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without-polar_orientation/14_w-p_o_c-l-c.mjs @@ -54,8 +54,7 @@ const testSteps = [ title: 'Stacked Area Chart', geometry: 'line', coordSystem: 'polar', - orientation: 'vertical', - split: false + orientation: 'vertical' } }), (chart) => diff --git a/test/e2e/test_cases/ww_animTiming_TESTS/without/02_w-w_c-r-c.mjs b/test/e2e/test_cases/ww_animTiming_TESTS/without/02_w-w_c-r-c.mjs index 14acbb546..d30d9598a 100755 --- a/test/e2e/test_cases/ww_animTiming_TESTS/without/02_w-w_c-r-c.mjs +++ b/test/e2e/test_cases/ww_animTiming_TESTS/without/02_w-w_c-r-c.mjs @@ -41,9 +41,7 @@ const testSteps = [ noop: { set: ['Year'] } }, title: 'Treemap', - geometry: 'rectangle', - // orientation: 'horizontal', - split: false + geometry: 'rectangle' } }), (chart) => diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/03_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/03_C_R.mjs index 7afaeaddd..3274a78a2 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/03_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/03_C_R.mjs @@ -30,7 +30,6 @@ const testSteps = [ }, title: 'Stacked Column / Sum(?) sub-elements', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -83,7 +82,6 @@ const testSteps = [ }, title: 'Stacked Column / Aggregate(?), Sum(?), - Discrete(?) elements', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -106,8 +104,7 @@ const testSteps = [ label: { set: ['Value 2 (+)'] } }, title: 'Stacked Column / Aggregate(?), Sum(?), - Discrete(?) elements', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { @@ -130,7 +127,6 @@ const testSteps = [ }, title: 'Stacked Column / Aggregate(?), Sum(?), - Discrete(?) elements', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -161,12 +157,12 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'stretch' }, color: { set: 'Country' } }, title: 'Stacked Percentage Column / Ratio%(?)', - align: 'stretch', legend: 'color' } }, @@ -197,11 +193,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Country'] }, - y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' } }, + y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' }, align: 'none' }, color: { set: 'Country' } }, - title: 'Groupped Column / Comparison(?), Group(?)', - align: 'none' + title: 'Groupped Column / Comparison(?), Group(?)' } }), @@ -216,8 +211,7 @@ const testSteps = [ }, color: { set: 'Country' } }, - title: 'Column / Aggregate(?), - Discrete(?)', - align: 'none' + title: 'Column / Aggregate(?), - Discrete(?)' } }), @@ -231,7 +225,6 @@ const testSteps = [ label: { set: 'Value 2 (+)' } }, title: 'Column / Total(?) Aggregate(?) - Discrete(?)', - align: 'none', legend: null } }), @@ -250,7 +243,6 @@ const testSteps = [ label: { set: null } }, title: 'Column / Drill down(?), + Discrete(?)', - align: 'none', legend: null } }, @@ -270,7 +262,6 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Groupped Column / Comparison(?), Group(?)', - align: 'none', legend: 'color' } }, @@ -289,8 +280,7 @@ const testSteps = [ y: { set: null, range: { min: '0%', max: '100%' } }, color: { set: 'Country' } }, - title: 'Stacked Bar / Sum(?)', - align: 'none' + title: 'Stacked Bar / Sum(?)' } }, { @@ -326,8 +316,7 @@ const testSteps = [ color: { set: 'Country' }, label: { set: 'Value 2 (+)' } }, - title: 'Stacked Bar / Sum(?)', - align: 'none' + title: 'Stacked Bar / Sum(?)' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/04_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/04_C_R.mjs index 7e146d120..a92c117ae 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/04_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/04_C_R.mjs @@ -15,7 +15,6 @@ const testSteps = [ }, title: 'Stacked Column', geometry: 'rectangle', - split: false, legend: 'color' } }), @@ -34,7 +33,6 @@ const testSteps = [ }, title: 'Stacked Column / Aggregate(?), Sum(?), - Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -57,8 +55,7 @@ const testSteps = [ label: { set: ['Value 2 (+)'] } }, title: 'Stacked Column / Aggregate(?), Sum(?), - Discrete(?)', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { @@ -81,7 +78,6 @@ const testSteps = [ }, title: 'Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -104,7 +100,6 @@ const testSteps = [ }, title: 'Stacked Column', geometry: 'rectangle', - split: false, legend: 'color' } }), @@ -119,7 +114,6 @@ const testSteps = [ }, title: 'Bar / Aggregate(?), Sum(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -155,7 +149,6 @@ const testSteps = [ }, title: 'Bar / Aggregate(?), Sum(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -176,7 +169,6 @@ const testSteps = [ }, title: 'Bar / Aggregate(?), Sum(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -198,7 +190,6 @@ const testSteps = [ }, title: 'Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }), @@ -214,7 +205,6 @@ const testSteps = [ }, title: '1 Column / Total(?), Aggregate', geometry: 'rectangle', - split: false, legend: null } }, @@ -249,7 +239,6 @@ const testSteps = [ }, title: '2 Column / Total(?), Aggregate', geometry: 'rectangle', - split: false, legend: null } }, @@ -281,7 +270,6 @@ const testSteps = [ }, title: '3 Column / Total(?), Aggregate', geometry: 'rectangle', - split: false, legend: null } }, @@ -303,7 +291,6 @@ const testSteps = [ }, title: '1 Column / Sum(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -325,7 +312,6 @@ const testSteps = [ }, title: '2 Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -347,7 +333,6 @@ const testSteps = [ }, title: '3 Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -371,7 +356,6 @@ const testSteps = [ }, title: '4 Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -392,7 +376,6 @@ const testSteps = [ }, title: 'Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -416,7 +399,6 @@ const testSteps = [ }, title: 'Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -432,13 +414,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: true }, color: { set: 'Country' } }, title: 'Splitted Column / Components(?)', geometry: 'rectangle', - split: true, legend: 'color' } }), @@ -451,13 +433,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: false }, color: { set: 'Country' } }, title: 'Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -473,12 +455,12 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'stretch' }, color: { set: 'Country' } }, - title: 'Stacked Percentage Column / Ratio%(?)', - align: 'stretch' + title: 'Stacked Percentage Column / Ratio%(?)' } }), @@ -490,15 +472,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + align: 'none' }, color: { set: 'Country' } }, title: 'Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -517,9 +498,7 @@ const testSteps = [ }, title: 'Scatter plot / + Continuous(?)', geometry: 'circle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -558,9 +537,7 @@ const testSteps = [ }, title: 'Stacked Column / - Continuous(?)', geometry: 'rectangle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -596,8 +573,7 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Lollipop / Distribute(?)', - geometry: 'circle', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/05_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/05_C_R.mjs index 46ecdfbf8..20acbebfa 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/05_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/05_C_R.mjs @@ -9,14 +9,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: 'Splitted Column', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }), @@ -25,13 +25,12 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Country'] }, - y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' } }, + y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' }, split: false }, color: { set: 'Country' } }, title: 'Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' }, style: { title: { @@ -47,14 +46,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: 'Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -67,13 +66,12 @@ const testSteps = [ config: { channels: { x: { set: ['Country', 'Year'] }, - y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' } }, + y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' }, split: false }, color: { set: 'Country' } }, title: 'Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => @@ -84,14 +82,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: 'Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -105,14 +103,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: false }, color: { set: 'Country' } }, title: 'Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => @@ -123,14 +121,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: 'Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -143,13 +141,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch', split: false } }, title: 'Stacked Percentage Column / Ratio%(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'stretch', - split: false + orientation: 'horizontal' } }), (chart) => @@ -160,15 +156,15 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'none', + split: true }, color: { set: 'Country' } }, title: 'Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'none', - split: true + orientation: 'horizontal' } }, { @@ -182,15 +178,13 @@ const testSteps = [ config: { channels: { x: { set: 'Value 5 (+/-)' }, - y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' } }, + y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' }, split: false }, color: { set: 'Country' }, noop: { set: 'Year' } }, title: 'Scatter plot / + Continuous(?)', geometry: 'circle', - orientation: 'horizontal', - align: 'none', - split: false + orientation: 'horizontal' } }, { @@ -222,16 +216,15 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' }, noop: { set: null } }, title: 'Splitted Column / - Continuous(?), Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'none', - split: true + orientation: 'horizontal' }, style: { title: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/21_C_C_dotplot.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/21_C_C_dotplot.mjs index 161beb7e2..eac3c0aae 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/21_C_C_dotplot.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/21_C_C_dotplot.mjs @@ -10,7 +10,6 @@ const testSteps = [ y: { set: 'Index', range: { max: '110%' } } }, title: 'Dot plot', - align: 'none', geometry: 'circle' } }), @@ -20,14 +19,12 @@ const testSteps = [ { config: { channels: { - x: { set: 'Year' }, + x: { set: 'Year', split: true }, y: { set: 'IMDb Rating', range: { max: '110%' } }, noop: { set: 'Index' } }, title: 'Dot plot / + Continuous(?), Distribution(?)', - align: 'none', orientation: 'vertical', - split: true, geometry: 'circle' } }, diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/22_C_C.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/22_C_C.mjs index c1fcb2199..8ad70ccf3 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/22_C_C.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/22_C_C.mjs @@ -172,7 +172,7 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Value 1 (+)', 'Country'] }, + x: { set: ['Value 1 (+)', 'Country'], split: true }, y: { set: 'Value 3 (+)' }, noop: { set: 'Year' }, color: { set: 'Country' } @@ -181,8 +181,7 @@ const testSteps = [ legend: 'color', geometry: 'circle', coordSystem: 'cartesian', - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => @@ -331,7 +330,7 @@ const testSteps = [ { config: { channels: { - x: { set: 'Value 1 (+)' }, + x: { set: 'Value 1 (+)', split: false }, y: { set: 'Value 3 (+)' }, noop: { set: 'Year' }, size: { set: ['Country', 'Value 2 (+)'] }, @@ -340,8 +339,7 @@ const testSteps = [ title: 'Scatter plot / Merge(?), Aggregate(?), - Discrete(?)', legend: 'color', geometry: 'circle', - coordSystem: 'cartesian', - split: false + coordSystem: 'cartesian' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/28_C_A.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/28_C_A.mjs index 1d01299c0..474b1a6de 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/28_C_A.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/28_C_A.mjs @@ -80,12 +80,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: { set: 'Country' } }, title: 'Trellis Area / Trellis(?), Components(?), Part-to-whole(?) (sort???)', - geometry: 'area', - split: true + geometry: 'area' } }, { @@ -99,12 +98,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: false }, color: { set: 'Country' } }, title: 'Stacked Area / Trellis off(?), Merge(?)', - geometry: 'area', - split: false + geometry: 'area' } }, { @@ -118,12 +116,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: { set: 'Country' } }, title: 'Stacked Area / Ratio(?)', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }, { @@ -155,13 +152,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'none' }, color: { set: 'Country' } }, title: 'Stacked Area / Ratio off(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -177,14 +172,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Value 2 (+)', 'Country'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: 'Bar / Sum(?)', - geometry: 'area', - align: 'none', - split: true + geometry: 'area' } }, { @@ -199,13 +193,11 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 2 (+)'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], split: false }, color: { set: null } }, title: 'Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }, { @@ -242,9 +234,7 @@ const testSteps = [ label: { set: 'Value 2 (+)' } }, title: 'Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }, { @@ -264,9 +254,7 @@ const testSteps = [ label: { set: null } }, title: 'Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }, { @@ -300,14 +288,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Value 2 (+)', 'Country'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: true }, color: { set: 'Country' } }, title: 'Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: true + geometry: 'area' } }, { @@ -322,13 +309,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: false }, color: { set: 'Country' } }, title: 'Stacked Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -346,9 +331,7 @@ const testSteps = [ color: { set: null } }, title: 'Area / Total timeseries(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -366,9 +349,7 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Stacked Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -386,9 +367,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '16 Lollipop / Distribution(?)', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' } }, { @@ -424,9 +403,7 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Stacked Area / Sum(?), Sum timeseries(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/35_C_A_violin.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/35_C_A_violin.mjs index bc2b63b6c..94e9b884d 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/35_C_A_violin.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/35_C_A_violin.mjs @@ -9,16 +9,16 @@ const testSteps = [ channels: { x: { set: ['Revenue', 'Format'], - range: { min: '-1%', max: '110%' } + range: { min: '-1%', max: '110%' }, + align: 'center', + split: true }, y: 'Year', color: 'Format' }, title: 'Violin', geometry: 'area', - align: 'center', - orientation: 'vertical', - split: true + orientation: 'vertical' }, style: { plot: { @@ -42,9 +42,7 @@ const testSteps = [ }, title: 'Violin', geometry: 'circle', - align: 'center', - orientation: 'vertical', - split: true + orientation: 'vertical' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps/38_C_L_line.mjs b/test/e2e/test_cases/ww_next_steps/next_steps/38_C_L_line.mjs index 3641fda1f..e9a1fb42a 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps/38_C_L_line.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps/38_C_L_line.mjs @@ -71,8 +71,7 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Line / Comparison(?), Components(?)', - geometry: 'line', - split: false + geometry: 'line' } }, { @@ -86,12 +85,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: { set: 'Country' } }, title: 'Trellis Area / Trellis(?), Components(?), Part-to-whole(?) (sort???)', - geometry: 'area', - split: true + geometry: 'area' } }, { @@ -105,12 +103,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', split: false }, color: { set: 'Country' } }, title: 'Line / Comparison(?)', - geometry: 'line', - split: false + geometry: 'line' } }, { @@ -124,12 +121,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: { set: 'Country' } }, title: 'Stacked Area / Ratio(?)', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }, { @@ -162,12 +158,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', align: 'none' }, color: { set: 'Country' } }, title: 'Line / Comparison(?), Components(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -187,7 +182,6 @@ const testSteps = [ }, title: 'Line / Aggregate(?), - Discrete(?)', geometry: 'area', - align: 'none', legend: null } }, @@ -206,8 +200,7 @@ const testSteps = [ color: { set: null } }, title: '2222 Line / Aggregate(?), - Discrete(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }), @@ -222,8 +215,7 @@ const testSteps = [ size: { set: null } }, title: 'Line / Drill down(?), + Discrete(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -242,7 +234,6 @@ const testSteps = [ }, title: 'Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }, @@ -277,7 +268,6 @@ const testSteps = [ }, title: 'Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }, @@ -298,7 +288,6 @@ const testSteps = [ }, title: 'Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }, @@ -319,7 +308,6 @@ const testSteps = [ }, title: 'Line / Drill down timeseries(?), + Discrete(?)', geometry: 'line', - align: 'none', legend: 'color' } }, @@ -354,7 +342,6 @@ const testSteps = [ }, title: 'Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - align: 'none', legend: 'color' } }, @@ -388,8 +375,7 @@ const testSteps = [ color: { set: 'Country' } }, title: 'Line / Comparison(?), + Components(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -418,12 +404,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: { set: 'Country' } }, title: 'Line / Comparison(?), + Components(?)', - geometry: 'line', - split: true + geometry: 'line' } }, { @@ -452,14 +437,13 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Country' }, + y: { set: 'Country', split: false }, color: { set: null }, lightness: { set: 'Value 2 (+)' } }, title: 'Heatmap / (?), (?), (sort???)', geometry: 'rectangle', - legend: null, - split: false + legend: null } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/03_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/03_C_R.mjs index 71b730887..2e72386da 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/03_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/03_C_R.mjs @@ -29,7 +29,6 @@ const testSteps = [ }, title: '2 Stacked Column / Sum(?) sub-elements', geometry: 'rectangle', - split: false, legend: 'color' } }), @@ -61,8 +60,7 @@ const testSteps = [ label: { set: ['Value 2 (+)'] } }, title: '5 Stacked Column / Aggregate(?), Sum(?), - Discrete(?) elements', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { @@ -100,12 +98,12 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'stretch' }, color: { set: 'Country' } }, title: '8 Stacked Percentage Column / Ratio%(?)', - align: 'stretch', legend: 'color' } }, @@ -121,11 +119,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Country'] }, - y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' } }, + y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' }, align: 'none' }, color: { set: 'Country' } }, - title: '9 Groupped Column / Comparison(?), Group(?)', - align: 'none' + title: '9 Groupped Column / Comparison(?), Group(?)' } }, { @@ -145,7 +142,6 @@ const testSteps = [ label: { set: 'Value 2 (+)' } }, title: '11 Column / Total(?) Aggregate(?) - Discrete(?)', - align: 'none', legend: null } }, @@ -166,7 +162,6 @@ const testSteps = [ label: null }, title: '13 Groupped Column / Comparison(?), Group(?)', - align: 'none', legend: 'color' } }, @@ -186,8 +181,7 @@ const testSteps = [ color: { set: 'Country' }, label: { set: 'Value 2 (+)' } }, - title: '15 Stacked Bar / Sum(?)', - align: 'none' + title: '15 Stacked Bar / Sum(?)' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/04_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/04_C_R.mjs index 760b06288..71d8abd64 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/04_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/04_C_R.mjs @@ -16,7 +16,6 @@ const testSteps = [ }, title: '1 Stacked Column', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -40,8 +39,7 @@ const testSteps = [ label: { set: ['Value 2 (+)'] } }, title: '2 Stacked Column / Aggregate(?), Sum(?), - Discrete(?)', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }, { @@ -65,7 +63,6 @@ const testSteps = [ }, title: '3 Stacked Column', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -87,7 +84,6 @@ const testSteps = [ }, title: '4 Bar / Aggregate(?), Sum(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -112,7 +108,6 @@ const testSteps = [ }, title: '5 Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -133,7 +128,6 @@ const testSteps = [ }, title: '6 Column / Total(?), Aggregate', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -155,7 +149,6 @@ const testSteps = [ }, title: '7 Column / Total(?), Aggregate', geometry: 'rectangle', - split: false, legend: null } }, @@ -180,7 +173,6 @@ const testSteps = [ }, title: '9 Stacked Column / Drill down(?), + Discrete(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -201,7 +193,6 @@ const testSteps = [ }, title: '10 Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - split: false, legend: null } }, @@ -225,7 +216,6 @@ const testSteps = [ }, title: '11 Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -242,13 +232,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: true }, color: { set: 'Country' } }, title: '12 Splitted Column / Components(?)', geometry: 'rectangle', - split: true, legend: 'color' } }), @@ -261,13 +251,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: false }, color: { set: 'Country' } }, title: '13 Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, legend: 'color' } }, @@ -284,12 +274,12 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'stretch' }, color: { set: 'Country' } }, - title: '14 Stacked Percentage Column / Ratio%(?)', - align: 'stretch' + title: '14 Stacked Percentage Column / Ratio%(?)' } }), @@ -301,15 +291,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + align: 'none' }, color: { set: 'Country' } }, title: '15 Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -329,9 +318,7 @@ const testSteps = [ }, title: '16 Scatter plot / + Continuous(?)', geometry: 'circle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -354,9 +341,7 @@ const testSteps = [ }, title: '17 Stacked Column / - Continuous(?)', geometry: 'rectangle', - split: false, - legend: 'color', - align: 'none' + legend: 'color' } }, { @@ -375,8 +360,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '18 Lollipop / Distribute(?)', - geometry: 'circle', - split: false + geometry: 'circle' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/05_C_R.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/05_C_R.mjs index 3f9bf4b84..39c8f5997 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/05_C_R.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/05_C_R.mjs @@ -9,14 +9,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: '1 Splitted Column', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }), @@ -25,13 +25,12 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Country'] }, - y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' } }, + y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' }, split: false }, color: { set: 'Country' } }, title: '2 Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' }, style: { title: { @@ -47,14 +46,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: '3 Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -67,13 +66,12 @@ const testSteps = [ config: { channels: { x: { set: ['Country', 'Year'] }, - y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' } }, + y: { set: ['Value 2 (+)'], range: { min: '0%', max: '100%' }, split: false }, color: { set: 'Country' } }, title: '4 Groupped Column / Comparison(?), Group(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => @@ -84,14 +82,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: '5 Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -105,14 +103,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: false }, color: { set: 'Country' } }, title: '6 Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: false + orientation: 'horizontal' } }), (chart) => @@ -123,14 +121,14 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: '7 Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - split: true + orientation: 'horizontal' } }, { @@ -143,13 +141,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch', split: false } }, title: '8 Stacked Percentage Column / Ratio%(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'stretch', - split: false + orientation: 'horizontal' } }), (chart) => @@ -160,15 +156,15 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + align: 'none', + split: true }, color: { set: 'Country' } }, title: '9 Splitted Column / Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'none', - split: true + orientation: 'horizontal' } }, { @@ -181,15 +177,13 @@ const testSteps = [ config: { channels: { x: { set: 'Value 5 (+/-)' }, - y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' } }, + y: { set: 'Value 2 (+)', range: { min: '0%', max: '110%' }, split: false }, color: { set: 'Country' }, noop: { set: 'Year' } }, title: '10 Scatter plot / + Continuous(?)', geometry: 'circle', - orientation: 'horizontal', - align: 'none', - split: false + orientation: 'horizontal' } }), (chart) => @@ -199,16 +193,15 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Country', 'Value 2 (+)'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' }, noop: { set: null } }, title: '11 Splitted Column / - Continuous(?), Components(?), Part-to-whole(?), Split(?)', geometry: 'rectangle', - orientation: 'horizontal', - align: 'none', - split: true + orientation: 'horizontal' }, style: { title: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/21_C_C_dotplot.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/21_C_C_dotplot.mjs index f52622634..69a9e43c5 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/21_C_C_dotplot.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/21_C_C_dotplot.mjs @@ -10,7 +10,6 @@ const testSteps = [ y: { set: 'Index', range: { max: '110%' } } }, title: 'Dot plot', - align: 'none', geometry: 'circle' } }), @@ -19,14 +18,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: 'Year', + x: { set: 'Year', split: true }, y: { set: 'IMDb Rating', range: { max: '110%' } }, noop: 'Index' }, title: 'Dot plot / + Continuous(?), Distribution(?)', - align: 'none', orientation: 'vertical', - split: true, geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/22_C_C.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/22_C_C.mjs index 3eeb7f6ae..8c7becc4b 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/22_C_C.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/22_C_C.mjs @@ -151,7 +151,7 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Value 1 (+)', 'Country'] }, + x: { set: ['Value 1 (+)', 'Country'], split: true }, y: { set: 'Value 3 (+)' }, noop: { set: 'Year' }, color: { set: 'Country' } @@ -160,8 +160,7 @@ const testSteps = [ legend: 'color', geometry: 'circle', coordSystem: 'cartesian', - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => @@ -264,7 +263,7 @@ const testSteps = [ { config: { channels: { - x: { set: 'Value 1 (+)' }, + x: { set: 'Value 1 (+)', split: false }, y: { set: 'Value 3 (+)' }, noop: { set: 'Year' }, size: { set: ['Country', 'Value 2 (+)'] }, @@ -273,8 +272,7 @@ const testSteps = [ title: '16 Scatter plot / Merge(?), Aggregate(?), - Discrete(?)', legend: 'color', geometry: 'circle', - coordSystem: 'cartesian', - split: false + coordSystem: 'cartesian' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/28_C_A.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/28_C_A.mjs index add691907..3f80f13f6 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/28_C_A.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/28_C_A.mjs @@ -57,12 +57,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: { set: 'Country' } }, title: '4 Trellis Area / Trellis(?), Components(?), Part-to-whole(?) (sort???)', - geometry: 'area', - split: true + geometry: 'area' } }, { @@ -76,12 +75,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: false }, color: { set: 'Country' } }, title: '5 Stacked Area / Trellis off(?), Merge(?)', - geometry: 'area', - split: false + geometry: 'area' } }, { @@ -94,12 +92,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: { set: 'Country' } }, title: '6 Stacked Area / Ratio(?)', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), @@ -109,13 +106,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'none' }, color: { set: 'Country' } }, title: '7 Stacked Area / Ratio off(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -131,14 +126,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Value 2 (+)', 'Country'], - range: { min: '0%', max: '100%' } + range: { min: '0%', max: '100%' }, + split: true }, color: { set: 'Country' } }, title: '8 Bar / Sum(?)', - geometry: 'area', - align: 'none', - split: true + geometry: 'area' } }, { @@ -152,13 +146,11 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 2 (+)'] }, - y: { set: ['Country'] }, + y: { set: ['Country'], split: false }, color: { set: null } }, title: '9 Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }), @@ -173,9 +165,7 @@ const testSteps = [ label: { set: 'Value 2 (+)' } }, title: '10 Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }, { @@ -194,9 +184,7 @@ const testSteps = [ label: { set: null } }, title: '11 Bar / Sum(?)', - geometry: 'rectangle', - align: 'none', - split: false + geometry: 'rectangle' } }), @@ -208,14 +196,13 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Value 2 (+)', 'Country'], - range: { min: '0%', max: '110%' } + range: { min: '0%', max: '110%' }, + split: true }, color: { set: 'Country' } }, title: '12 Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: true + geometry: 'area' } }, { @@ -230,13 +217,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: false }, color: { set: 'Country' } }, title: '13 Stacked Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -254,9 +239,7 @@ const testSteps = [ color: { set: null } }, title: '14 Area / Total timeseries(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -274,9 +257,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '15 Stacked Area / Time distribution(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { @@ -293,9 +274,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '16 Lollipop / Distribution(?)', - geometry: 'circle', - align: 'none', - split: false + geometry: 'circle' } }), @@ -309,9 +288,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '17 Stacked Area / Sum(?), Sum timeseries(?)', - geometry: 'area', - align: 'none', - split: false + geometry: 'area' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/38_C_L_line.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/38_C_L_line.mjs index 8f10e3104..d58865fa6 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_Tests/38_C_L_line.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_Tests/38_C_L_line.mjs @@ -48,8 +48,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '3 Line / Comparison(?), Components(?)', - geometry: 'line', - split: false + geometry: 'line' } }, { @@ -63,12 +62,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: { set: 'Country' } }, title: '4 Trellis Area / Trellis(?), Components(?), Part-to-whole(?) (sort???)', - geometry: 'area', - split: true + geometry: 'area' } }, { @@ -82,12 +80,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', split: false }, color: { set: 'Country' } }, title: '5 Line / Comparison(?)', - geometry: 'line', - split: false + geometry: 'line' } }, { @@ -100,12 +97,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Value 2 (+)', 'Country'] }, + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: { set: 'Country' } }, title: '6 Stacked Area / Ratio(?)', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), @@ -115,12 +111,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', align: 'none' }, color: { set: 'Country' } }, title: '7 Line / Comparison(?), Components(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -139,8 +134,7 @@ const testSteps = [ color: { set: null } }, title: '8 Line / Aggregate(?), - Discrete(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -159,8 +153,7 @@ const testSteps = [ size: { set: null } }, title: '9 Line / Drill down(?), + Discrete(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { @@ -178,7 +171,6 @@ const testSteps = [ }, title: '10 Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }), @@ -195,7 +187,6 @@ const testSteps = [ }, title: '11 Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }, @@ -216,7 +207,6 @@ const testSteps = [ }, title: '12 Bar / Sum(?)', geometry: 'rectangle', - align: 'none', legend: null } }, @@ -236,7 +226,6 @@ const testSteps = [ }, title: '13 Line / Drill down timeseries(?), + Discrete(?)', geometry: 'line', - align: 'none', legend: 'color' } }), @@ -251,7 +240,6 @@ const testSteps = [ }, title: '14 Stacked Column / Sum(?), Stack(?)', geometry: 'rectangle', - align: 'none', legend: 'color' } }), @@ -265,8 +253,7 @@ const testSteps = [ color: { set: 'Country' } }, title: '15 Line / Comparison(?), + Components(?)', - geometry: 'line', - align: 'none' + geometry: 'line' } }), @@ -275,12 +262,11 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: { set: 'Country' } }, title: '16 Line / Comparison(?), + Components(?)', - geometry: 'line', - split: true + geometry: 'line' } }), @@ -289,14 +275,13 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: 'Country' }, + y: { set: 'Country', split: false }, color: { set: null }, lightness: { set: 'Value 2 (+)' } }, title: '17 Heatmap / (?), (?), (sort???)', geometry: 'rectangle', - legend: null, - split: false + legend: null } }) ] diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_04.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_04.mjs index ee28e2a84..74c3dd3e1 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_04.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_04.mjs @@ -8,11 +8,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' }, - title: 'Stacked Column', - align: 'stretch' + title: 'Stacked Column' } }), @@ -21,10 +20,9 @@ const testSteps = [ config: { channels: { x: ['Year', 'Country'], - y: 'Value 2 (+)' + y: { set: 'Value 2 (+)', align: 'none' } }, - title: 'Group and Align min Markers to Compare Values', - align: 'none' + title: 'Group and Align min Markers to Compare Values' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_05.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_05.mjs index 6421b7ec4..cf7c907c9 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_05.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_05.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' }, - title: 'Splitted Column', - split: true + title: 'Splitted Column' }, style: { plot: { @@ -32,11 +31,10 @@ const testSteps = [ config: { channels: { x: ['Year', 'Country'], - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, label: null }, - title: 'Split off & Group Markers to Compare Values', - split: false + title: 'Split off & Group Markers to Compare Values' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_06.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_06.mjs index 2322200ed..2abc3ebdb 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_06.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_06.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' }, - title: 'Splitted Column', - split: true + title: 'Splitted Column' }, style: { plot: { @@ -32,11 +31,10 @@ const testSteps = [ config: { channels: { x: ['Country', 'Year'], - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, label: null }, - title: 'Split off & Group Markers to See Trends by Components', - split: false + title: 'Split off & Group Markers to See Trends by Components' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_09.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_09.mjs index e69296896..42981daf4 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_09.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_09.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: 'Country' }, title: 'Trellis Area', - geometry: 'area', - split: true + geometry: 'area' } }), @@ -21,11 +20,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 2 (+)' + y: { set: 'Value 2 (+)', split: false } }, title: 'CHG Geom., Split off & Unstack to Compare Components', - geometry: 'line', - split: false + geometry: 'line' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_10.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_10.mjs index e9ac3793f..1a4ef3566 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_10.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_10.mjs @@ -24,8 +24,7 @@ const testSteps = [ y: 'Value 2 (+)' }, title: 'Change Geom. & Unstack to Compare Components', - geometry: 'line', - align: 'none' + geometry: 'line' } }, { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_11.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_11.mjs index 93ead5bc4..1968d5dea 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_11.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/compare/comparison_11.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: 'Country' }, title: 'Percentage Stacked Area', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), @@ -21,11 +20,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 2 (+)' + y: { set: 'Value 2 (+)', align: 'none' } }, title: 'Align min, CHG Geom. & Unstack to Comp. Components', - geometry: 'line', - align: 'none' + geometry: 'line' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_01.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_01.mjs index a2d4536e1..d7a2f2e28 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_01.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_01.mjs @@ -20,11 +20,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, label: 'Value 2 (+)' }, - title: 'Split Components to See them Separately', - split: true + title: 'Split Components to See them Separately' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_02.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_02.mjs index c157abce9..0191f5b8d 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_02.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_02.mjs @@ -11,8 +11,7 @@ const testSteps = [ y: 'Value 2 (+)', color: 'Country' }, - title: 'Groupped Column by Countries and Time', - split: false + title: 'Groupped Column by Countries and Time' } }), (chart) => @@ -20,11 +19,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, label: 'Value 2 (+)' }, - title: 'Split Components to Compare Components Year by Year', - split: true + title: 'Split Components to Compare Components Year by Year' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_03.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_03.mjs index f2d34f360..0d7ef3d94 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_03.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_03.mjs @@ -11,18 +11,17 @@ const testSteps = [ y: ['Country', 'Value 2 (+)'], color: 'Country' }, - title: 'Stacked Column', - split: false + title: 'Stacked Column' } }), (chart) => chart.animate({ config: { channels: { - label: 'Value 2 (+)' + label: 'Value 2 (+)', + y: { split: true } }, - title: 'Split Components to See them Separately', - split: true + title: 'Split Components to See them Separately' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_04.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_04.mjs index d3deda0b6..7d7571c6a 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_04.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_04.mjs @@ -8,23 +8,23 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' }, - title: 'Stacked Percentage Column', - align: 'stretch', - split: false + title: 'Stacked Percentage Column' } }), (chart) => chart.animate({ config: { channels: { - label: 'Value 2 (+)' + label: 'Value 2 (+)', + y: { + align: 'none', + split: true + } }, - title: 'ALign min & Split Components to See them Separately', - align: 'none', - split: true + title: 'ALign min & Split Components to See them Separately' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_05.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_05.mjs index 43aa81e09..5300dabd3 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_05.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_05.mjs @@ -22,12 +22,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: ['Value 1 (+)', 'Country'] + x: { set: ['Value 1 (+)', 'Country'], split: true } }, title: 'Split Components to See them Separately', geometry: 'circle', - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_06.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_06.mjs index 5c101ae2e..a1dc82dc8 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_06.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_06.mjs @@ -20,7 +20,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split Components to See them Separately', - split: true + y: { split: true } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_07.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_07.mjs index be5ecd8f4..e208d8df9 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_07.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/components/components_07.mjs @@ -20,11 +20,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 2 (+)', 'Country'] + y: { set: ['Value 2 (+)', 'Country'], split: true } }, title: 'Split Components to See them Separately', - geometry: 'area', - split: true + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_05.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_05.mjs index f4c1e64b0..66a7f7376 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_05.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_05.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' }, - title: 'Splitted Column', - split: true + title: 'Splitted Column' }, style: { plot: { @@ -32,13 +31,12 @@ const testSteps = [ config: { channels: { x: 'Value 5 (+/-)', - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, noop: 'Year', label: null }, title: 'Change Geom. to See Distribution by a New Measure', - geometry: 'circle', - split: false + geometry: 'circle' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_06.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_06.mjs index 2ba1f5565..baee61c19 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_06.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_06.mjs @@ -18,12 +18,12 @@ const testSteps = [ chart.animate({ config: { channels: { + x: { split: true }, y: { set: 'IMDb Rating', range: { max: '105%' } }, noop: 'Index' }, title: "Let's See the Distribution by a New Measure", - orientation: 'vertical', - split: true + orientation: 'vertical' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_08.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_08.mjs index 8c4ee71a6..0050b0f46 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_08.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/distribute/distribution_08.mjs @@ -7,14 +7,13 @@ const testSteps = [ config: { channels: { - x: ['Value 1 (+)', 'Country'], + x: { set: ['Value 1 (+)', 'Country'], split: true }, y: 'Value 3 (+)', noop: 'Year', color: 'Country' }, title: 'Trellis Scatter plot', geometry: 'circle', - split: true, orientation: 'vertical' } }), diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_01.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_01.mjs index 161a480fd..089b868c2 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_01.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_01.mjs @@ -19,7 +19,7 @@ const testSteps = [ chart.animate({ config: { title: 'Stretch Markers to See Ratio of Categories', - align: 'stretch' + y: { align: 'stretch' } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_02.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_02.mjs index 0a53f8dc6..96a8f9c32 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_02.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_02.mjs @@ -20,10 +20,9 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'] + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' } }, - title: 'Stack & Stretch Markers to See Ratio of Categories', - align: 'stretch' + title: 'Stack & Stretch Markers to See Ratio of Categories' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_03.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_03.mjs index 857e1325f..ad269a0a5 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_03.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_03.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' }, - title: 'Splitted Column', - split: true + title: 'Splitted Column' }, style: { plot: { @@ -31,11 +30,13 @@ const testSteps = [ chart.animate({ config: { channels: { - label: null + label: null, + y: { + align: 'stretch', + split: false + } }, - title: 'Split off & Stretch Markers to See Ratio of Categories', - align: 'stretch', - split: false + title: 'Split off & Stretch Markers to See Ratio of Categories' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_04.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_04.mjs index 56661ca2b..b0e3d7a22 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_04.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_04.mjs @@ -20,7 +20,7 @@ const testSteps = [ chart.animate({ config: { title: 'Stretch Markers to See Ratio of Categories', - align: 'stretch' + y: { align: 'stretch' } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_05.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_05.mjs index 2ee8f40fa..e09439484 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_05.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/ratio/ratio_05.mjs @@ -20,11 +20,10 @@ const testSteps = [ chart.animate({ config: { channels: { - y: ['Value 2 (+)', 'Country'] + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' } }, title: 'CHG Geom. & Stretch Markers to See Ratio of Categories', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/remove/remove_03.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/remove/remove_03.mjs index d2b92ecba..069a7b444 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/remove/remove_03.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/remove/remove_03.mjs @@ -13,8 +13,7 @@ const testSteps = [ noop: 'Year' }, title: 'Scatter plot', - geometry: 'circle', - split: false + geometry: 'circle' } }), (chart) => @@ -22,13 +21,12 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, noop: null, label: 'Value 2 (+)' }, title: 'If Remove a Measure, then a Splitted Column is Better', - geometry: 'rectangle', - split: true + geometry: 'rectangle' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09.mjs index ea2147caa..c74d13e0c 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_09.mjs @@ -8,11 +8,10 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' }, - title: 'Percentage Stacked Column', - align: 'stretch' + title: 'Percentage Stacked Column' } }), @@ -20,7 +19,7 @@ const testSteps = [ chart.animate({ config: { title: 'Align min to Sum of the Values(Components?)', - align: 'none' + y: { align: 'none' } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_10.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_10.mjs index 4f67c0378..8b762f283 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_10.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_10.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country', label: 'Value 2 (+)' }, - title: 'Splitted Column', - split: true + title: 'Splitted Column' }, style: { plot: { @@ -31,10 +30,10 @@ const testSteps = [ chart.animate({ config: { channels: { - label: null + label: null, + y: { split: false } }, - title: 'Split off to Sum of Components(Values?)', - split: false + title: 'Split off to Sum of Components(Values?)' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_18.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_18.mjs index b4ae93062..d16d00907 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_18.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_18.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], split: true }, color: 'Country' }, title: 'Splitted Area', - geometry: 'area', - split: true + geometry: 'area' } }), @@ -21,7 +20,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split off to Sum of the Components', - split: false + y: { split: false } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_19.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_19.mjs index 66a05482a..0ae70dbb6 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_19.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/sum_aggregate/sum_aggregate_19.mjs @@ -8,12 +8,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Value 2 (+)', 'Country'], + y: { set: ['Value 2 (+)', 'Country'], align: 'stretch' }, color: 'Country' }, title: 'Percentage Stacked Area', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), @@ -21,7 +20,7 @@ const testSteps = [ chart.animate({ config: { title: 'Align min to See Sum instead of Ratio of Components', - align: 'none' + y: { align: 'none' } } }), (chart) => { diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/composition_comparison_pie_coxcomb_column_2dis_2con.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/composition_comparison_pie_coxcomb_column_2dis_2con.mjs index 6883a4b1a..3470ddb5e 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/composition_comparison_pie_coxcomb_column_2dis_2con.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/composition_comparison_pie_coxcomb_column_2dis_2con.mjs @@ -15,8 +15,6 @@ const testSteps = [ }, title: 'Donat Chart', coordSystem: 'polar' - // sort: 'byValue', - // reverse: true } } // {regroupStrategy: 'fade'} diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs index 7e7ccbd42..c8a12016f 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/merge_split_radial_stacked_rectangle_2dis_1con.mjs @@ -25,7 +25,7 @@ const testSteps = [ chart.animate({ config: { title: 'Split Bars to Show/See Values of 2nd Categories', - split: true + x: { split: true } } }) ] diff --git a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/orientation_marimekko_rectangle_2dis_2con.mjs b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/orientation_marimekko_rectangle_2dis_2con.mjs index 1fa366abe..737a4842b 100755 --- a/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/orientation_marimekko_rectangle_2dis_2con.mjs +++ b/test/e2e/test_cases/ww_next_steps/next_steps_byOperations/wOld_animated/orientation_marimekko_rectangle_2dis_2con.mjs @@ -7,13 +7,12 @@ const testSteps = [ config: { channels: { x: ['Country', 'Value 2 (+)'], - y: ['Joy factors', 'Value 3 (+)'], + y: { set: ['Joy factors', 'Value 3 (+)'], align: 'stretch' }, color: 'Joy factors', label: 'Value 2 (+)', lightness: 'Country' }, title: 'Marimekko Chart', - align: 'stretch', orientation: 'horizontal' } }), @@ -23,7 +22,9 @@ const testSteps = [ config: { title: 'Marimekko with Other Orientation II', orientation: 'vertical', - label: 'Value 3 (+)' + label: 'Value 3 (+)', + x: { align: 'stretch' }, + y: { align: 'none' } } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/04a_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/04a_are.mjs index 32cd882b9..e6ac58cb3 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/04a_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/04a_are.mjs @@ -22,8 +22,7 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Joy factors', 'Value 2 (+)'] } }, - title: 'Add previous Conti', - align: 'none' + title: 'Add previous Conti' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/06a_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/06a_are.mjs index 6c78cb0a6..88d77dddd 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/06a_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/1_des_pol/area/06a_are.mjs @@ -22,8 +22,7 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Joy factors', 'Value 3 (+)'] } }, - title: 'Add Conti', - align: 'none' + title: 'Add Conti' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs index 9acb789f0..d87dfce15 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs @@ -8,15 +8,13 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Joy factors', 'Value 2 (+)'], + y: { set: ['Joy factors', 'Value 2 (+)'], align: 'center', split: true }, color: 'Joy factors', noop: 'Year', size: 'Value 2 (+)' }, title: 'Stacked Area Chart', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs index 096c2a97f..0572d75d5 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs @@ -41,8 +41,7 @@ const testSteps = [ size: { set: 'Value 2 (+)' }, lightness: { set: 'Value 1 (+)' } }, - title: 'Change CoordSys', - align: 'none' + title: 'Change CoordSys' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/Marker_transition_problem/area_column_time_sum.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/Marker_transition_problem/area_column_time_sum.mjs index 4bf8069e7..f093bd699 100644 --- a/test/e2e/test_cases/ww_noFade/wNoFade_Tests/Marker_transition_problem/area_column_time_sum.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_Tests/Marker_transition_problem/area_column_time_sum.mjs @@ -6,13 +6,12 @@ const testSteps = [ data, config: { channels: { - y: ['Joy factors', 'Value 2 (+)'], + y: { set: ['Joy factors', 'Value 2 (+)'], split: true }, x: 'Year', color: 'Joy factors' }, title: 'Split Area Chart', - geometry: 'area', - split: true + geometry: 'area' } }), @@ -20,13 +19,12 @@ const testSteps = [ chart.animate({ config: { channels: { - y: 'Value 2 (+)', + y: { set: 'Value 2 (+)', split: false }, x: 'Joy factors', label: 'Value 2 (+)' }, title: 'Column Chart', - geometry: 'rectangle', - split: false + geometry: 'rectangle' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/04a_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/04a_are.mjs index c6f6d7c5c..8d309217a 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/04a_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/04a_are.mjs @@ -24,7 +24,6 @@ const testSteps = [ y: 'Joy factors' }, title: 'Remove Conti', - align: 'stretch', orientation: 'horizontal' } }), @@ -54,7 +53,6 @@ const testSteps = [ y: ['Joy factors', 'Value 2 (+)'] }, title: 'Add previous Conti', - align: 'none', orientation: 'horizontal' } }) diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/06a_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/06a_are.mjs index 1fe795834..3a31420a1 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/06a_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/area/06a_are.mjs @@ -22,8 +22,7 @@ const testSteps = [ x: 'Country_code', y: 'Joy factors' }, - title: 'Remove Conti', - align: 'stretch' + title: 'Remove Conti' } }), @@ -50,8 +49,7 @@ const testSteps = [ x: 'Year', y: ['Joy factors', 'Value 3 (+)'] }, - title: 'Add Conti', - align: 'none' + title: 'Add Conti' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle/09_rec_TemporalDistribution.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle/09_rec_TemporalDistribution.mjs index a82d2a1c3..bb73464d4 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle/09_rec_TemporalDistribution.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle/09_rec_TemporalDistribution.mjs @@ -27,14 +27,12 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Country', 'Value 2 (+)'] } + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' } }, title: 'Value', geometry: 'area', legend: null, - orientation: 'horizontal', - align: 'stretch', - split: false + orientation: 'horizontal' } }, { @@ -63,13 +61,12 @@ const testSteps = [ config: { channels: { x: { set: ['Year'] }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], align: 'none' }, color: { set: 'Country' } }, title: 'Stacked Area Chart', geometry: 'area', orientation: 'horizontal', - align: 'none', legend: null } }, @@ -107,7 +104,6 @@ const testSteps = [ title: 'Overlay Area Chart', geometry: 'area', orientation: 'horizontal', - align: 'none', legend: null }, style: { @@ -147,14 +143,12 @@ const testSteps = [ config: { channels: { x: { set: ['Year'] }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: { set: 'Country' } }, title: 'Splitted Area Chart', geometry: 'area', orientation: 'horizontal', - align: 'none', - split: true, legend: null }, style: { @@ -193,14 +187,12 @@ const testSteps = [ config: { channels: { x: { set: ['Year'] }, - y: { set: ['Value 2 (+)'] }, + y: { set: ['Value 2 (+)'], split: false }, color: { set: 'Country' } }, title: 'Line Chart', geometry: 'line', orientation: 'horizontal', - align: 'none', - split: false, legend: null } }, diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/04a_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/04a_rec_Ve1_2c.mjs index 39cf6cc6f..a7171335e 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/04a_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/04a_rec_Ve1_2c.mjs @@ -37,12 +37,11 @@ const testSteps = [ { config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { @@ -76,13 +75,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch off & axisLabel on', - orientation: 'horizontal', - align: 'none' + orientation: 'horizontal' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/05a_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/05a_rec_Ve1_2c.mjs index 03649774a..bf3f03356 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/05a_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/05a_rec_Ve1_2c.mjs @@ -36,12 +36,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { @@ -84,13 +83,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: ['Country', 'Value 1 (+)'] }, color: { set: 'Country' } }, title: 'Stretch off & axisLabel on', - orientation: 'horizontal', - align: 'none' + orientation: 'horizontal' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve1_2c.mjs index ec1eed210..3b496b249 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve1_2c.mjs @@ -35,12 +35,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: 'Value 3 (+)' }, + x: { set: 'Value 3 (+)', align: 'stretch' }, y: { set: ['Year', 'Value 2 (+)'], labelLevel: 0 }, color: null }, - title: 'Stack Disc & Remove Color & Stretch & axisLabel off', - align: 'stretch' + title: 'Stack Disc & Remove Color & Stretch & axisLabel off' }, style: { plot: { @@ -69,12 +68,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: 'Value 2 (+)', range: { max: '125%' } }, color: { set: 'Joy factors' } }, - title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve2_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve2_2c.mjs index 020cfe5f3..68f854403 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve2_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/07a_rec_Ve2_2c.mjs @@ -35,11 +35,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 3 (+)'] }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: null }, - title: 'Remove Color & Stretch & axisLabel off', - align: 'stretch' + title: 'Remove Color & Stretch & axisLabel off' }, style: { plot: { @@ -70,11 +69,10 @@ const testSteps = [ config: { channels: { x: { set: ['Joy factors', 'Value 3 (+)'] }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', align: 'none' }, color: { set: 'Joy factors' } }, - title: 'Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/08a_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/08a_rec_Ve1_2c.mjs index c4e587017..2633e5535 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/08a_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/1_des_pol/rectangle_Ve1/08a_rec_Ve1_2c.mjs @@ -35,12 +35,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: 'Value 1 (+)' }, + x: { set: 'Value 1 (+)', align: 'stretch' }, y: { set: ['Year', 'Value 2 (+)'], labelLevel: 0 }, color: null }, - title: 'Stack Disc & Remove Color & change Conti & Stretch & axisLabel off', - align: 'stretch' + title: 'Stack Disc & Remove Color & change Conti & Stretch & axisLabel off' }, style: { plot: { @@ -69,12 +68,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 1 (+)'] }, + x: { set: ['Joy factors', 'Value 1 (+)'], align: 'none' }, y: { set: 'Value 2 (+)' }, color: { set: 'Joy factors' } }, - title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/04a_d-w_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/04a_d-w_are.mjs index 8a3326739..a01eba708 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/04a_d-w_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/04a_d-w_are.mjs @@ -65,8 +65,7 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Joy factors', 'Value 2 (+)'] } }, - title: 'Add previous Conti', - align: 'none' + title: 'Add previous Conti' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs index 530edac67..aaf87e753 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area-rectangle/10_d-w_are_temporal_bubble.mjs @@ -8,15 +8,13 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Joy factors', 'Value 2 (+)'] }, + y: { set: ['Joy factors', 'Value 2 (+)'], align: 'center', split: true }, color: { set: 'Joy factors' }, noop: { set: 'Year' }, size: { set: ['Value 2 (+)'] } }, title: 'Stacked Area Chart', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/04a_d-w_are.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/04a_d-w_are.mjs index 8c7960c97..9d30aca75 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/04a_d-w_are.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/04a_d-w_are.mjs @@ -65,8 +65,7 @@ const testSteps = [ x: { set: 'Year' }, y: { set: ['Joy factors', 'Value 2 (+)'] } }, - title: 'Add previous Conti', - align: 'none' + title: 'Add previous Conti' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/10_d-w_are_temporal_bubble.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/10_d-w_are_temporal_bubble.mjs index c1789983c..b9728866a 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/10_d-w_are_temporal_bubble.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/area/10_d-w_are_temporal_bubble.mjs @@ -8,15 +8,13 @@ const testSteps = [ config: { channels: { x: { set: 'Year' }, - y: { set: ['Joy factors', 'Value 2 (+)'] }, + y: { set: ['Joy factors', 'Value 2 (+)'], align: 'center', split: true }, color: { set: 'Joy factors' }, noop: { set: 'Year' }, size: { set: ['Value 2 (+)'] } }, title: 'Stacked Area Chart', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle/07_d-w_cir_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle/07_d-w_cir_2c.mjs index 2a8b59203..90a3fbd5f 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle/07_d-w_cir_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle/07_d-w_cir_2c.mjs @@ -42,8 +42,7 @@ const testSteps = [ noop: null, size: { set: ['Year', 'Country'] } }, - title: 'Stacked Discs', - align: 'center' + title: 'Stacked Discs' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle_V1/07_d-w_cir_V1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle_V1/07_d-w_cir_V1_2c.mjs index d4e2ae5c8..6f27b1b04 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle_V1/07_d-w_cir_V1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/circle_V1/07_d-w_cir_V1_2c.mjs @@ -42,8 +42,7 @@ const testSteps = [ noop: null, size: { set: ['Year', 'Country'] } }, - title: 'Stack Discrete', - align: 'center' + title: 'Stack Discrete' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs index 1b2de3873..7962651ae 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle/08a_d-w_rec_2c.mjs @@ -81,8 +81,7 @@ const testSteps = [ size: { set: 'Value 2 (+)' }, lightness: { set: 'Value 1 (+)' } }, - title: 'Change CoordSys', - align: 'none' + title: 'Change CoordSys' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/04a_d-w_rec_Ve1_2c_V1.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/04a_d-w_rec_Ve1_2c_V1.mjs index 2780de1be..2f0784dbd 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/04a_d-w_rec_Ve1_2c_V1.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/04a_d-w_rec_Ve1_2c_V1.mjs @@ -37,12 +37,11 @@ const testSteps = [ { config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/07a_d-w_rec_Ve1_2c_V1.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/07a_d-w_rec_Ve1_2c_V1.mjs index ec816671c..33630ce86 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/07a_d-w_rec_Ve1_2c_V1.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/07a_d-w_rec_Ve1_2c_V1.mjs @@ -53,7 +53,7 @@ const testSteps = [ { config: { channels: { - x: { set: 'Value 3 (+)' }, + x: { set: 'Value 3 (+)', align: 'stretch' }, y: { set: ['Joy factors', 'Value 2 (+)'], range: { min: '0%', max: '100%' }, @@ -61,8 +61,7 @@ const testSteps = [ } }, title: 'Change Disc', - orientation: 'auto', - align: 'stretch' + orientation: 'auto' } }, { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/08a_d-w_rec_Ve1_2c_V1.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/08a_d-w_rec_Ve1_2c_V1.mjs index 9370096e5..562ce1cdf 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/08a_d-w_rec_Ve1_2c_V1.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_V1/08a_d-w_rec_Ve1_2c_V1.mjs @@ -70,8 +70,7 @@ const testSteps = [ size: { set: 'Value 2 (+)' }, lightness: { set: 'Value 1 (+)' } }, - title: 'Add Conti & add new Disc Color & Change CoordSys', - align: 'none' + title: 'Add Conti & add new Disc Color & Change CoordSys' } }) ] diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/04a_d-w_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/04a_d-w_rec_Ve1_2c.mjs index c9b8fc9a1..0e72a1ad7 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/04a_d-w_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/04a_d-w_rec_Ve1_2c.mjs @@ -36,12 +36,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { @@ -72,13 +71,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch off & axisLabel on', - orientation: 'horizontal', - align: 'none' + orientation: 'horizontal' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/05a_d-w_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/05a_d-w_rec_Ve1_2c.mjs index 67dfd2814..9c3e1d680 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/05a_d-w_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/05a_d-w_rec_Ve1_2c.mjs @@ -36,12 +36,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { @@ -84,13 +83,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: ['Country', 'Value 1 (+)'] }, color: { set: 'Country' } }, title: 'Stretch off & axisLabel on', - orientation: 'horizontal', - align: 'none' + orientation: 'horizontal' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/06a_d-w_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/06a_d-w_rec_Ve1_2c.mjs index 2993b564f..95103feb2 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/06a_d-w_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/06a_d-w_rec_Ve1_2c.mjs @@ -37,12 +37,11 @@ const testSteps = [ { config: { channels: { - x: { set: ['Year', 'Value 3 (+)'] }, + x: { set: ['Year', 'Value 3 (+)'], align: 'stretch' }, y: { set: ['Country', 'Value 2 (+)'] }, color: { set: 'Country' } }, title: 'Stretch & axisLabel off', - align: 'stretch', orientation: 'vertical' }, style: { @@ -92,13 +91,12 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: ['Country', 'Value 1 (+)'] }, color: { set: 'Country' } }, title: 'Stretch off & axisLabel on', - orientation: 'horizontal', - align: 'none' + orientation: 'horizontal' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c.mjs index 8f155823d..5187ebd02 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c.mjs @@ -35,12 +35,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: 'Value 3 (+)' }, + x: { set: 'Value 3 (+)', align: 'stretch' }, y: { set: ['Year', 'Value 2 (+)'], labelLevel: 0 }, color: null }, - title: 'Stack Disc & Remove Color & Stretch & axisLabel off', - align: 'stretch' + title: 'Stack Disc & Remove Color & Stretch & axisLabel off' }, style: { plot: { @@ -69,12 +68,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 3 (+)'] }, + x: { set: ['Joy factors', 'Value 3 (+)'], align: 'none' }, y: { set: 'Value 2 (+)', range: { max: '125%' } }, color: { set: 'Joy factors' } }, - title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c_filter.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c_filter.mjs index e89eebefd..57742b539 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c_filter.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve1_2c_filter.mjs @@ -37,11 +37,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 3 (+)'], labelLevel: 0 }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: null }, - title: '1 Tile Stretch & Remove Color', - align: 'stretch' + title: '1 Tile Stretch & Remove Color' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve2_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve2_2c.mjs index 48dda342a..536bdde33 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve2_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve2_2c.mjs @@ -36,11 +36,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 3 (+)'] }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: null }, - title: 'Remove Color & Stretch & axisLabel off', - align: 'stretch' + title: 'Remove Color & Stretch & axisLabel off' }, style: { plot: { @@ -71,11 +70,10 @@ const testSteps = [ config: { channels: { x: { set: ['Joy factors', 'Value 3 (+)'] }, - y: { set: 'Value 2 (+)' }, + y: { set: 'Value 2 (+)', align: 'none' }, color: { set: 'Joy factors' } }, - title: 'Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve3_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve3_2c.mjs index c00a48432..d7c5119b6 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve3_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/07a_d-w_rec_Ve3_2c.mjs @@ -37,11 +37,10 @@ const testSteps = [ config: { channels: { x: { set: ['Year', 'Value 3 (+)'], labelLevel: 0 }, - y: { set: ['Country', 'Value 2 (+)'] }, + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: null }, - title: '1 Tile Stretch & Remove Color', - align: 'stretch' + title: '1 Tile Stretch & Remove Color' } }), diff --git a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/08a_d-w_rec_Ve1_2c.mjs b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/08a_d-w_rec_Ve1_2c.mjs index 376dbdf1d..0c3b04d4c 100755 --- a/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/08a_d-w_rec_Ve1_2c.mjs +++ b/test/e2e/test_cases/ww_noFade/wNoFade_cases/2_des_pol-without/rectangle_Ve1/08a_d-w_rec_Ve1_2c.mjs @@ -35,12 +35,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: 'Value 1 (+)' }, + x: { set: 'Value 1 (+)', align: 'stretch' }, y: { set: ['Year', 'Value 2 (+)'], labelLevel: 0 }, color: null }, - title: 'Stack Disc & Remove Color & Change Conti & Stretch & axisLabel off', - align: 'stretch' + title: 'Stack Disc & Remove Color & Change Conti & Stretch & axisLabel off' }, style: { plot: { @@ -69,12 +68,11 @@ const testSteps = [ chart.animate({ config: { channels: { - x: { set: ['Joy factors', 'Value 1 (+)'] }, + x: { set: ['Joy factors', 'Value 1 (+)'], align: 'none' }, y: { set: 'Value 2 (+)' }, color: { set: 'Joy factors' } }, - title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on', - align: 'none' + title: 'Group new Disc & Add new Disc Color & Stretch off & axisLabel on' }, style: { plot: { @@ -93,8 +91,7 @@ const testSteps = [ size: { set: 'Value 2 (+)' }, lightness: { set: 'Value 1 (+)' } }, - title: 'Change CoordSys', - align: 'none' + title: 'Change CoordSys' } }) ] diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/05_C_R_split_column_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/05_C_R_split_column_chart.mjs index 9e25a3300..a1bc016a7 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/05_C_R_split_column_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/05_C_R_split_column_chart.mjs @@ -6,13 +6,12 @@ const testSteps = [ data, config: { channels: { - y: ['Value 2 (+)', 'Joy factors'], + y: { set: ['Value 2 (+)', 'Joy factors'], split: true }, x: 'Year', color: 'Joy factors', label: 'Value 2 (+)' }, - title: 'Split Column Chart', - split: true + title: 'Split Column Chart' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/06_C_R_100_stacked_column_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/06_C_R_100_stacked_column_chart.mjs index ee6bfde91..5f470ca93 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/06_C_R_100_stacked_column_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/06_C_R_100_stacked_column_chart.mjs @@ -15,12 +15,11 @@ const testSteps = [ config: { channels: { x: 'Country', - y: ['Joy factors', 'Value 2 (+)'], + y: { set: ['Joy factors', 'Value 2 (+)'], align: 'stretch' }, color: 'Joy factors', label: 'Value 2 (+)' }, - title: 'Percentage Stacked Column Chart', - align: 'stretch' + title: 'Percentage Stacked Column Chart' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/10_C_R_marimekko_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/10_C_R_marimekko_chart.mjs index 898210b9d..7213bf1f2 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/10_C_R_marimekko_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/10_C_R_marimekko_chart.mjs @@ -13,13 +13,12 @@ const testSteps = [ config: { channels: { x: ['Country', 'Value 2 (+)'], - y: ['Joy factors', 'Value 3 (+)'], + y: { set: ['Joy factors', 'Value 3 (+)'], align: 'stretch' }, color: 'Joy factors', label: 'Value 2 (+)', lightness: 'Country' }, title: 'Marimekko Chart', - align: 'stretch', orientation: 'horizontal' } }) diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/12_C_R_matrix_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/12_C_R_matrix_chart.mjs index 9cbad29db..368f1c52a 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/12_C_R_matrix_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/12_C_R_matrix_chart.mjs @@ -9,8 +9,7 @@ const testSteps = [ x: 'Year', y: { set: 'Index', range: { max: '100%' } } }, - title: 'Matrix Chart', - align: 'none' + title: 'Matrix Chart' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/16_C_R_splitted_bar_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/16_C_R_splitted_bar_chart.mjs index 57287723e..ae5ca5f37 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/16_C_R_splitted_bar_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/16_C_R_splitted_bar_chart.mjs @@ -6,13 +6,12 @@ const testSteps = [ data, config: { channels: { - x: ['Value 2 (+)', 'Joy factors'], + x: { set: ['Value 2 (+)', 'Joy factors'], split: true }, y: 'Year', color: 'Joy factors', label: 'Value 2 (+)' }, - title: 'Split Bar Chart', - split: true + title: 'Split Bar Chart' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/17_C_R_100_stacked_bar_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/17_C_R_100_stacked_bar_chart.mjs index 802c56365..dd549de53 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/17_C_R_100_stacked_bar_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/17_C_R_100_stacked_bar_chart.mjs @@ -14,13 +14,12 @@ const testSteps = [ }), config: { channels: { - x: ['Joy factors', 'Value 2 (+)'], + x: { set: ['Joy factors', 'Value 2 (+)'], align: 'stretch' }, y: 'Country', color: 'Joy factors', label: 'Value 2 (+)' }, - title: 'Percentage Stacked Bar Chart', - align: 'stretch' + title: 'Percentage Stacked Bar Chart' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/201_C_C_devided_lollipop_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/201_C_C_devided_lollipop_chart.mjs index 7b41eaafe..945deafbf 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/201_C_C_devided_lollipop_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/201_C_C_devided_lollipop_chart.mjs @@ -11,7 +11,6 @@ const testSteps = [ color: 'Country' }, title: 'Lollipop Chart', - align: 'none', geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/20_C_C_lollipop_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/20_C_C_lollipop_chart.mjs index a6aa30dc3..23fa938f8 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/20_C_C_lollipop_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/20_C_C_lollipop_chart.mjs @@ -11,7 +11,6 @@ const testSteps = [ label: 'Value 2 (+)' }, title: 'Lollipop Chart', - align: 'none', geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/21_C_C_dot_plot_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/21_C_C_dot_plot_chart.mjs index cffbc21f8..6b5de983b 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/21_C_C_dot_plot_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/21_C_C_dot_plot_chart.mjs @@ -10,7 +10,6 @@ const testSteps = [ y: { set: 'Index', range: { max: '110%' } } }, title: 'Dot plot Chart', - align: 'none', geometry: 'circle' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart.mjs index 8f8cc3a83..a9d118f11 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart.mjs @@ -10,7 +10,6 @@ const testSteps = [ y: { set: 'Value 1 (+)', range: { min: '0%', max: '110%' } } }, title: 'Area Chart', - align: 'none', geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart_negative.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart_negative.mjs index 97bcd5739..1869145d0 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart_negative.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/27_C_A_area_chart_negative.mjs @@ -10,7 +10,6 @@ const testSteps = [ y: { set: ['Value 5 (+/-)'], range: { min: '0%', max: '110%' } } }, title: 'Area Chart with (-) Nums', - align: 'none', geometry: 'area' } }), diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/29_C_A_stacked_area_chart_percentage_labels.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/29_C_A_stacked_area_chart_percentage_labels.mjs index a38104609..a5d166aa0 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/29_C_A_stacked_area_chart_percentage_labels.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/29_C_A_stacked_area_chart_percentage_labels.mjs @@ -7,12 +7,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], align: 'stretch' }, color: 'Country' }, title: 'Percentage Stacked Area Chart', - geometry: 'area', - align: 'stretch' + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/31_C_A_splitted_area_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/31_C_A_splitted_area_chart.mjs index 1394629e1..5d2748b52 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/31_C_A_splitted_area_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/31_C_A_splitted_area_chart.mjs @@ -15,12 +15,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Country', 'Value 2 (+)'], + y: { set: ['Country', 'Value 2 (+)'], split: true }, color: 'Country' }, title: 'Split Area Chart (Ridgeline plot)', - geometry: 'area', - split: true + geometry: 'area' } }), (chart) => { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/32_C_A_stream_graph.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/32_C_A_stream_graph.mjs index fa729acfe..956977134 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/32_C_A_stream_graph.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/32_C_A_stream_graph.mjs @@ -11,12 +11,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Format', 'Revenue'], + y: { set: ['Format', 'Revenue'], align: 'center' }, color: 'Format' }, title: 'Stream Graph', - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/33_C_A_stream_graph_vert.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/33_C_A_stream_graph_vert.mjs index 3ff3e2744..df192422b 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/33_C_A_stream_graph_vert.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/33_C_A_stream_graph_vert.mjs @@ -10,13 +10,12 @@ const testSteps = [ data, config: { channels: { - x: ['Format', 'Revenue'], + x: { set: ['Format', 'Revenue'], align: 'center' }, y: 'Year', color: 'Format' }, title: 'Stream Graph Vertical', - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/34_C_A_violin_graph.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/34_C_A_violin_graph.mjs index fc2b68571..1657de073 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/34_C_A_violin_graph.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/34_C_A_violin_graph.mjs @@ -11,13 +11,11 @@ const testSteps = [ config: { channels: { x: 'Year', - y: ['Format', 'Revenue'], + y: { set: ['Format', 'Revenue'], align: 'center', split: true }, color: 'Format' }, title: 'Violin Graph', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/35_C_A_violin_graph_vert.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/35_C_A_violin_graph_vert.mjs index 4ffcd4900..8062715ef 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/35_C_A_violin_graph_vert.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/35_C_A_violin_graph_vert.mjs @@ -10,14 +10,12 @@ const testSteps = [ data, config: { channels: { - x: ['Format', 'Revenue'], + x: { set: ['Format', 'Revenue'], align: 'center', split: true }, y: 'Year', color: 'Format' }, title: 'Violin Graph Vertical', - geometry: 'area', - align: 'center', - split: true + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/36_C_A_range_area_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/36_C_A_range_area_chart.mjs index d691c990a..08a3f6a77 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/36_C_A_range_area_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/36_C_A_range_area_chart.mjs @@ -16,7 +16,6 @@ const testSteps = [ }, title: 'Range area chart', geometry: 'area', - align: 'none', legend: null }, style: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/37_C_A_funnel.mjs b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/37_C_A_funnel.mjs index a531ca3a2..07d190ea5 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/37_C_A_funnel.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/cartesian_coo_sys/37_C_A_funnel.mjs @@ -6,14 +6,13 @@ const testSteps = [ data, config: { channels: { - x: 'Num', + x: { set: 'Num', align: 'center' }, y: 'Phase', color: 'Phase', label: ['Phase', 'Num'] }, title: 'Funnel', - geometry: 'area', - align: 'center' + geometry: 'area' }, style: { plot: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/52_P_R_nested_multi_level_donut_chart.mjs b/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/52_P_R_nested_multi_level_donut_chart.mjs index 4c98d5457..72d773a51 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/52_P_R_nested_multi_level_donut_chart.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/52_P_R_nested_multi_level_donut_chart.mjs @@ -11,13 +11,12 @@ const testSteps = [ }), config: { channels: { - x: ['Joy factors', 'Value 2 (+)'], + x: { set: ['Joy factors', 'Value 2 (+)'], align: 'stretch' }, y: { attach: ['Country'], range: { min: '-50%' } }, color: 'Joy factors', label: 'Value 2 (+)' }, title: 'Nested (Multi-level) Donut Chart', - align: 'stretch', coordSystem: 'polar' }, style: { diff --git a/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/551_P_A_polar_stream_graph.mjs b/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/551_P_A_polar_stream_graph.mjs index b0310dfc4..d8dbc15fd 100755 --- a/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/551_P_A_polar_stream_graph.mjs +++ b/test/e2e/test_cases/ww_samples_for_presets/polar_coo_sys/551_P_A_polar_stream_graph.mjs @@ -10,15 +10,13 @@ const testSteps = [ data, config: { channels: { - x: ['Format', 'Revenue'], + x: { set: ['Format', 'Revenue'], align: 'center', split: true }, y: 'Year', color: 'Format' }, title: 'Polar Stream Graph', geometry: 'area', - coordSystem: 'polar', - align: 'center', - split: true + coordSystem: 'polar' } }) }, diff --git a/test/e2e/tests/config_tests.json b/test/e2e/tests/config_tests.json index f02d24344..eca0d0a7d 100644 --- a/test/e2e/tests/config_tests.json +++ b/test/e2e/tests/config_tests.json @@ -41,7 +41,7 @@ "refs": ["2ac83c5"] }, "dimension_axis_title": { - "refs": ["33278a6"] + "refs": ["0f4b203"] }, "dimension_axis_density": { "refs": ["0de86a3"] diff --git a/test/e2e/tests/config_tests/dimension_axis_title.mjs b/test/e2e/tests/config_tests/dimension_axis_title.mjs index 854438e75..6cd96ddbd 100644 --- a/test/e2e/tests/config_tests/dimension_axis_title.mjs +++ b/test/e2e/tests/config_tests/dimension_axis_title.mjs @@ -25,8 +25,8 @@ const testSteps = [ }), (chart) => chart.animate({ - x: { set: 'Baz' }, - size: { set: 'Baz' } + x: { set: 'Baz', title: 'Who' }, + size: { set: 'Baz', title: 'Bigness' } }) ] diff --git a/test/e2e/tests/config_tests/main_axis_split.mjs b/test/e2e/tests/config_tests/main_axis_split.mjs new file mode 100644 index 000000000..f9c52815e --- /dev/null +++ b/test/e2e/tests/config_tests/main_axis_split.mjs @@ -0,0 +1,30 @@ +const testSteps = [ + (chart) => { + const data = { + series: [ + { name: 'Foo', values: ['Alice', 'Bob', 'Ted'] }, + { name: 'Bar', values: ['Happy', 'Happy', 'Sad'] }, + { name: 'Baz', values: [1, 2, 3] }, + { name: 'Bau', values: [4, 3, 2] } + ] + } + + return chart.animate({ data }) + }, + (chart) => + chart.animate({ + config: { + x: { set: 'Foo', split: true }, + y: { set: 'Bar' } + } + }), + (chart) => + chart.animate({ + config: { + x: { set: 'Foo' }, + y: { set: ['Bar', 'Bau'] } + } + }) +] + +export default testSteps diff --git a/test/e2e/tests/fixes.json b/test/e2e/tests/fixes.json index fd616844e..00c4b2230 100644 --- a/test/e2e/tests/fixes.json +++ b/test/e2e/tests/fixes.json @@ -8,7 +8,7 @@ "refs": ["1732a49"] }, "143": { - "refs": ["95b9c83"] + "refs": ["0775a8d"] }, "144": { "refs": ["fde02e4"] diff --git a/test/e2e/tests/fixes/143.mjs b/test/e2e/tests/fixes/143.mjs index c564fb184..3f6436b36 100644 --- a/test/e2e/tests/fixes/143.mjs +++ b/test/e2e/tests/fixes/143.mjs @@ -28,9 +28,14 @@ const testSteps = [ return chart.animate({ data, config: { - y: 'Colors', - x: 'Val', - split: true + y: { + set: 'Colors', + split: true + }, + x: { + set: 'Val', + split: true + } } }) }, diff --git a/test/e2e/tests/fixes/174.mjs b/test/e2e/tests/fixes/174.mjs index d212e5792..6393a6435 100644 --- a/test/e2e/tests/fixes/174.mjs +++ b/test/e2e/tests/fixes/174.mjs @@ -12,10 +12,9 @@ const testSteps = [ }, (chart) => chart.animate({ - x: { set: 'Foo', title: 'Valami', ticks: true, guides: true }, + x: { set: 'Foo', title: 'Valami', ticks: true, guides: true, sort: 'byValue' }, y: { set: 'Bar', title: 'Valami', ticks: true, guides: true, interlacing: false }, - geometry: 'circle', - sort: 'byValue' + geometry: 'circle' }) ] diff --git a/test/e2e/tests/fixes/319.mjs b/test/e2e/tests/fixes/319.mjs index c63a59301..3ba947e21 100644 --- a/test/e2e/tests/fixes/319.mjs +++ b/test/e2e/tests/fixes/319.mjs @@ -21,7 +21,7 @@ const testSteps = [ }), (chart) => chart.animate({ - sort: 'byValue' + x: { sort: 'byValue' } }), (chart) => chart.animate({ @@ -30,7 +30,7 @@ const testSteps = [ }), (chart) => chart.animate({ - sort: 'none' + x: { sort: 'none' } }) ] diff --git a/test/e2e/tests/fixes/42836788.mjs b/test/e2e/tests/fixes/42836788.mjs index 3c9946ec6..abdefd4fd 100644 --- a/test/e2e/tests/fixes/42836788.mjs +++ b/test/e2e/tests/fixes/42836788.mjs @@ -31,10 +31,9 @@ const testSteps = [ (chart) => chart.animate({ x: 'Genres', - y: ['Kinds', 'Genres'], + y: { set: ['Kinds', 'Genres'], split: true }, color: 'Kinds', - lightness: 'Genres', - split: true + lightness: 'Genres' }) ] diff --git a/test/e2e/tests/fixes/536.mjs b/test/e2e/tests/fixes/536.mjs index 7ece60622..32a167907 100644 --- a/test/e2e/tests/fixes/536.mjs +++ b/test/e2e/tests/fixes/536.mjs @@ -11,11 +11,10 @@ const testSteps = [ (chart) => chart.animate({ channels: { - x: 'Foo', + x: { set: 'Foo', reverse: true }, y: 'Bar' }, - geometry: 'area', - reverse: true + geometry: 'area' }), (chart) => @@ -24,13 +23,13 @@ const testSteps = [ }), (chart) => chart.animate({ + x: { sort: 'byValue' }, coordSystem: 'cartesian', - geometry: 'line', - sort: 'byValue' + geometry: 'line' }), (chart) => chart.animate({ - reverse: false + x: { reverse: false } }) ] diff --git a/test/e2e/tests/style_tests/plot/interlacing.mjs b/test/e2e/tests/style_tests/plot/interlacing.mjs index d166e666c..df760017f 100644 --- a/test/e2e/tests/style_tests/plot/interlacing.mjs +++ b/test/e2e/tests/style_tests/plot/interlacing.mjs @@ -124,8 +124,7 @@ const testSteps = [ }, config: { x: { guides: true, range: { max: '133%' } }, - y: { guides: true, range: { max: '150%' } }, - reverse: true + y: { guides: true, range: { max: '150%' }, reverse: true } } }) ] diff --git a/test/e2e/tests/style_tests/plot/spacing.mjs b/test/e2e/tests/style_tests/plot/spacing.mjs index 4698c249f..7b6ff0e3b 100644 --- a/test/e2e/tests/style_tests/plot/spacing.mjs +++ b/test/e2e/tests/style_tests/plot/spacing.mjs @@ -13,8 +13,7 @@ const testSteps = [ (chart) => chart.animate({ x: { set: ['Bar'] }, - y: { set: ['Baz', 'Foo'], labelLevel: 0 }, - split: true + y: { set: ['Baz', 'Foo'], labelLevel: 0, split: true } }), (chart) => chart.animate({ diff --git a/test/e2e/tests/tickets/138.mjs b/test/e2e/tests/tickets/138.mjs index fb5284faa..c99d69d23 100644 --- a/test/e2e/tests/tickets/138.mjs +++ b/test/e2e/tests/tickets/138.mjs @@ -14,8 +14,7 @@ const testSteps = [ chart.animate({ x: 'Foo', color: 'Foo2', - y: { set: ['Bar', 'Foo2'], range: { max: 1.2 } }, - align: 'stretch' + y: { set: ['Bar', 'Foo2'], range: { max: 1.2 }, align: 'stretch' } }) ] diff --git a/test/e2e/tests/tickets/146.mjs b/test/e2e/tests/tickets/146.mjs index 71b2f0230..1b88cf892 100644 --- a/test/e2e/tests/tickets/146.mjs +++ b/test/e2e/tests/tickets/146.mjs @@ -24,9 +24,8 @@ const testSteps = [ }, (chart) => chart.animate({ - y: ['Colors', 'Val'], - x: 'Letters', - split: true + y: { set: ['Colors', 'Val'], split: true }, + x: 'Letters' }) ] diff --git a/test/e2e/tests/tickets/398.mjs b/test/e2e/tests/tickets/398.mjs index aa28933ce..0ca7475c0 100644 --- a/test/e2e/tests/tickets/398.mjs +++ b/test/e2e/tests/tickets/398.mjs @@ -13,11 +13,10 @@ const testSteps = [ }, (chart) => chart.animate({ - x: ['Foo', 'Foo2'], + x: { set: ['Foo', 'Foo2'], sort: 'byValue' }, y: 'Baz', color: 'Foo', - geometry: 'circle', - sort: 'byValue' + geometry: 'circle' }), (chart) => chart.animate({