Skip to content

Commit

Permalink
Don't use deprecated options in tests (#6609)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kurkle @etimberg
kurkle authored and etimberg committed Oct 27, 2019
1 parent 21da5be commit 29de4af
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 37 deletions.
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-absolute.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2019", "2024", "2025"],
"datasets": [{
"backgroundColor": "rgba(255, 99, 132, 0.5)",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": 128,
"data": [1, null, 3, 4, 5]
}]
},
Expand All @@ -17,9 +20,6 @@
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": 128,
"time": {
"parser": "YYYY"
},
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-flex-offset.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2020", "2024", "2038"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"data": [1, null, 3, 4, 5]
}]
},
Expand All @@ -17,9 +20,6 @@
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"time": {
"parser": "YYYY"
},
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-flex-single-reverse.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1]
}]
},
Expand All @@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-flex-single.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1]
}]
},
Expand All @@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barThickness": "flex",
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-flex.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2017", "2018", "2020", "2024", "2038"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"data": [1, null, 3, 4, 5]
}]
},
Expand All @@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"barThickness": "flex",
"time": {
"parser": "YYYY"
},
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/controller.bar/bar-thickness-max.json
View file
Expand Up @@ -5,6 +5,9 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"maxBarThickness": 8,
"data": [1, null, 3, 4, 5]
}]
},
Expand All @@ -16,9 +19,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"maxBarThickness": 8,
"time": {
"parser": "YYYY"
},
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-min-interval.json
View file
Expand Up @@ -5,6 +5,8 @@
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"backgroundColor": "#FF6384",
"barPercentage": 1,
"categoryPercentage": 1,
"data": [1, null, 3, 4, 5]
}]
},
Expand All @@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
8 changes: 6 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-multiple.json
View file
Expand Up @@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
8 changes: 6 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-no-overlap.json
View file
Expand Up @@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY-MM"
},
Expand Down
8 changes: 6 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-offset.json
View file
Expand Up @@ -18,13 +18,17 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"offset": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
8 changes: 6 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-reverse.json
View file
Expand Up @@ -18,12 +18,16 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-single-xy.json
View file
Expand Up @@ -4,6 +4,8 @@
"data": {
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"barPercentage": 1,
"categoryPercentage": 1,
"backgroundColor": "#FF6384",
"data": [{"x": "2022", "y": 42}]
}]
Expand All @@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-single.json
View file
Expand Up @@ -4,6 +4,8 @@
"data": {
"labels": ["2016", "2018", "2020", "2024", "2030"],
"datasets": [{
"barPercentage": 1,
"categoryPercentage": 1,
"backgroundColor": "#FF6384",
"data": [1]
}]
Expand All @@ -16,8 +18,6 @@
"xAxes": [{
"type": "time",
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
8 changes: 6 additions & 2 deletions test/fixtures/controller.bar/bar-thickness-stacked.json
View file
Expand Up @@ -18,13 +18,17 @@
"responsive": false,
"legend": false,
"title": false,
"datasets": {
"bar": {
"barPercentage": 1,
"categoryPercentage": 1
}
},
"scales": {
"xAxes": [{
"type": "time",
"stacked": true,
"display": false,
"barPercentage": 1,
"categoryPercentage": 1,
"time": {
"parser": "YYYY"
},
Expand Down
18 changes: 15 additions & 3 deletions test/specs/controller.bar.tests.js
View file
Expand Up @@ -1214,12 +1214,16 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barPercentage: 1,
}
},
scales: {
xAxes: [{
type: 'category',
display: false,
stacked: true,
barPercentage: 1,
}],
yAxes: [{
type: 'logarithmic',
Expand Down Expand Up @@ -1275,12 +1279,16 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barPercentage: 1,
}
},
scales: {
xAxes: [{
type: 'category',
display: false,
stacked: true,
barPercentage: 1,
}],
yAxes: [{
type: 'logarithmic',
Expand Down Expand Up @@ -1670,11 +1678,15 @@ describe('Chart.controllers.bar', function() {
options: {
legend: false,
title: false,
datasets: {
bar: {
barThickness: barThickness
}
},
scales: {
xAxes: [{
id: 'x',
type: 'category',
barThickness: barThickness
}],
yAxes: [{
type: 'linear',
Expand Down

0 comments on commit 29de4af

Please sign in to comment.