diff --git a/test/fixtures/controller.radar/borderCapStyle/scriptable.js b/test/fixtures/controller.radar/borderCapStyle/scriptable.js index 6c5e0e9b66f..128bf6e7001 100644 --- a/test/fixtures/controller.radar/borderCapStyle/scriptable.js +++ b/test/fixtures/controller.radar/borderCapStyle/scriptable.js @@ -2,11 +2,11 @@ module.exports = { config: { type: 'radar', data: { - labels: [0, 1, 2, 3], + labels: [0, 1, 2], datasets: [ { // option in dataset - data: [3, 3, 3, 3], + data: [null, 3, 3], borderCapStyle: function(ctx) { var index = (ctx.datasetIndex % 2); return index === 0 ? 'round' @@ -16,11 +16,11 @@ module.exports = { }, { // option in element (fallback) - data: [2, 2, 2, 2] + data: [null, 2, 2] }, { // option in element (fallback) - data: [1, 1, 1, 1] + data: [null, 1, 1] } ] }, diff --git a/test/fixtures/controller.radar/borderCapStyle/scriptable.png b/test/fixtures/controller.radar/borderCapStyle/scriptable.png index 036e6ce86ed..0be3c6212a0 100644 Binary files a/test/fixtures/controller.radar/borderCapStyle/scriptable.png and b/test/fixtures/controller.radar/borderCapStyle/scriptable.png differ diff --git a/test/fixtures/controller.radar/borderCapStyle/value.js b/test/fixtures/controller.radar/borderCapStyle/value.js index e626a2e16e7..ad6aa1fedc1 100644 --- a/test/fixtures/controller.radar/borderCapStyle/value.js +++ b/test/fixtures/controller.radar/borderCapStyle/value.js @@ -2,21 +2,21 @@ module.exports = { config: { type: 'radar', data: { - labels: [0, 1, 2, 3], + labels: [0, 1, 2], datasets: [ { // option in dataset - data: [3, 3, 3, 3], + data: [null, 3, 3], borderCapStyle: 'round' }, { // option in dataset - data: [2, 2, 2, 2], + data: [null, 2, 2], borderCapStyle: 'square' }, { // option in element (fallback) - data: [1, 1, 1, 1] + data: [null, 1, 1] } ] }, diff --git a/test/fixtures/controller.radar/borderCapStyle/value.png b/test/fixtures/controller.radar/borderCapStyle/value.png index a3194c4529b..9e297d67b42 100644 Binary files a/test/fixtures/controller.radar/borderCapStyle/value.png and b/test/fixtures/controller.radar/borderCapStyle/value.png differ diff --git a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js index b2ff0d78a61..ff33d60dacc 100644 --- a/test/fixtures/controller.radar/borderJoinStyle/scriptable.js +++ b/test/fixtures/controller.radar/borderJoinStyle/scriptable.js @@ -6,7 +6,7 @@ module.exports = { datasets: [ { // option in dataset - data: [3, 3, 3, 3], + data: [3, 3, null, 3], borderColor: '#ff0000', borderJoinStyle: function(ctx) { var index = ctx.datasetIndex % 3; @@ -17,12 +17,12 @@ module.exports = { }, { // option in element (fallback) - data: [2, 2, 2, 2], + data: [2, 2, null, 2], borderColor: '#0000ff' }, { // option in element (fallback) - data: [1, 1, 1, 1] + data: [1, 1, null, 1] } ] }, diff --git a/test/fixtures/controller.radar/borderJoinStyle/scriptable.png b/test/fixtures/controller.radar/borderJoinStyle/scriptable.png index d816e327b06..9b2248bb2fe 100644 Binary files a/test/fixtures/controller.radar/borderJoinStyle/scriptable.png and b/test/fixtures/controller.radar/borderJoinStyle/scriptable.png differ diff --git a/test/fixtures/controller.radar/borderJoinStyle/value.js b/test/fixtures/controller.radar/borderJoinStyle/value.js index 003044ebc69..04a6beb66f1 100644 --- a/test/fixtures/controller.radar/borderJoinStyle/value.js +++ b/test/fixtures/controller.radar/borderJoinStyle/value.js @@ -6,19 +6,19 @@ module.exports = { datasets: [ { // option in dataset - data: [3, 3, 3, 3], + data: [3, 3, null, 3], borderColor: '#ff0000', borderJoinStyle: 'round' }, { // option in element (fallback) - data: [2, 2, 2, 2], + data: [2, 2, null, 2], borderColor: '#0000ff', borderJoinStyle: 'bevel' }, { // option in element (fallback) - data: [1, 1, 1, 1] + data: [1, 1, null, 1] } ] }, diff --git a/test/fixtures/controller.radar/borderJoinStyle/value.png b/test/fixtures/controller.radar/borderJoinStyle/value.png index bdbf2220d46..757d05190ed 100644 Binary files a/test/fixtures/controller.radar/borderJoinStyle/value.png and b/test/fixtures/controller.radar/borderJoinStyle/value.png differ diff --git a/test/fixtures/controller.radar/pointBorderColor/indexable.js b/test/fixtures/controller.radar/pointBorderColor/indexable.js index 429931b7109..f7e0626d65b 100644 --- a/test/fixtures/controller.radar/pointBorderColor/indexable.js +++ b/test/fixtures/controller.radar/pointBorderColor/indexable.js @@ -38,6 +38,7 @@ module.exports = { '#8800ff', '#ffff88' ], + borderWidth: 5, radius: 10 } }, diff --git a/test/fixtures/controller.radar/pointBorderColor/indexable.png b/test/fixtures/controller.radar/pointBorderColor/indexable.png index e4477851c63..309cb1cdab2 100644 Binary files a/test/fixtures/controller.radar/pointBorderColor/indexable.png and b/test/fixtures/controller.radar/pointBorderColor/indexable.png differ diff --git a/test/fixtures/controller.radar/pointBorderColor/scriptable.js b/test/fixtures/controller.radar/pointBorderColor/scriptable.js index 11ac0d6ce53..d9678c311ce 100644 --- a/test/fixtures/controller.radar/pointBorderColor/scriptable.js +++ b/test/fixtures/controller.radar/pointBorderColor/scriptable.js @@ -36,6 +36,7 @@ module.exports = { : value > -8 ? '#ff0000' : '#00ff00'; }, + borderWidth: 5, radius: 10 } }, diff --git a/test/fixtures/controller.radar/pointBorderColor/scriptable.png b/test/fixtures/controller.radar/pointBorderColor/scriptable.png index a9069a49d4b..de47d1b48a7 100644 Binary files a/test/fixtures/controller.radar/pointBorderColor/scriptable.png and b/test/fixtures/controller.radar/pointBorderColor/scriptable.png differ diff --git a/test/fixtures/controller.radar/pointBorderColor/value.js b/test/fixtures/controller.radar/pointBorderColor/value.js index 140196f912c..d639e2816fd 100644 --- a/test/fixtures/controller.radar/pointBorderColor/value.js +++ b/test/fixtures/controller.radar/pointBorderColor/value.js @@ -24,6 +24,7 @@ module.exports = { }, point: { borderColor: '#00ff00', + borderWidth: 5, radius: 10 } }, diff --git a/test/fixtures/controller.radar/pointBorderColor/value.png b/test/fixtures/controller.radar/pointBorderColor/value.png index da4948fb87c..537e49fc9a1 100644 Binary files a/test/fixtures/controller.radar/pointBorderColor/value.png and b/test/fixtures/controller.radar/pointBorderColor/value.png differ