From: Evert Timberg Date: Mon, 18 Jan 2021 12:40:18 +0000 (-0500) Subject: Update to test utils 0.1.2 to track font setting (#8325) X-Git-Tag: v3.0.0-beta.10~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06fa8a4c982fa41b785e702f54f9b16f62a0e433;p=thirdparty%2FChart.js.git Update to test utils 0.1.2 to track font setting (#8325) --- diff --git a/package-lock.json b/package-lock.json index 9a6cd01b6..a63b856f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1329,9 +1329,9 @@ "dev": true }, "chartjs-test-utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/chartjs-test-utils/-/chartjs-test-utils-0.1.1.tgz", - "integrity": "sha512-u+LHaWAu8yAVB/1/oSoKqrBt4OEAptxJylZAKnCReHp4vgdMaXw8xqeL2r3gZeei8l7SZk98wEk6Ldb2PKNrPg==", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/chartjs-test-utils/-/chartjs-test-utils-0.1.2.tgz", + "integrity": "sha512-l56FYfquEbUfy8qV+IvPq2Z0jeG6bYmCvKvpAXMNY8c49L3e2uvJ5H3nMaDfkwBHMTwqE+Gt9Uy7TRVzqxJp8w==", "dev": true, "requires": { "jasmine": "^3.6.3", diff --git a/package.json b/package.json index 2398d38dc..ad8852466 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@typescript-eslint/eslint-plugin": "^4.11.1", "@typescript-eslint/parser": "^4.11.1", "chartjs-adapter-moment": "^0.1.2", - "chartjs-test-utils": "^0.1.1", + "chartjs-test-utils": "^0.1.2", "concurrently": "^5.3.0", "coveralls": "^3.1.0", "cross-env": "^7.0.3", diff --git a/test/specs/helpers.canvas.tests.js b/test/specs/helpers.canvas.tests.js index 8bab0ada3..000890892 100644 --- a/test/specs/helpers.canvas.tests.js +++ b/test/specs/helpers.canvas.tests.js @@ -51,6 +51,9 @@ describe('Chart.helpers.canvas', function() { expect(context.getCalls()).toEqual([{ name: 'save', args: [] + }, { + name: 'setFont', + args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"], }, { name: 'measureText', args: ['FooBar'] @@ -63,6 +66,9 @@ describe('Chart.helpers.canvas', function() { }, { name: 'save', args: [] + }, { + name: 'setFont', + args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"], }, { name: 'measureText', args: ['FooBar_1'] @@ -103,12 +109,15 @@ describe('Chart.helpers.canvas', function() { describe('renderText', function() { it('should render multiple lines of text', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, ['foo', 'foo2'], 0, 0, font); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'fillText', args: ['foo', 0, 0, undefined], @@ -123,11 +132,14 @@ describe('Chart.helpers.canvas', function() { it('should accept the text maxWidth', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {maxWidth: 30}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'fillText', args: ['foo', 0, 0, 30], @@ -139,12 +151,15 @@ describe('Chart.helpers.canvas', function() { it('should underline the text', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {decorationWidth: 3, underline: true}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'fillText', args: ['foo', 0, 0, undefined], @@ -177,12 +192,15 @@ describe('Chart.helpers.canvas', function() { it('should strikethrough the text', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {strikethrough: true}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'fillText', args: ['foo', 0, 0, undefined], @@ -215,12 +233,15 @@ describe('Chart.helpers.canvas', function() { it('should set the fill style if supplied', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {color: 'red'}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'setFillStyle', args: ['red'], @@ -235,11 +256,14 @@ describe('Chart.helpers.canvas', function() { it('should set the stroke style if supplied', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {strokeColor: 'red', strokeWidth: 2}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'setStrokeStyle', args: ['red'], @@ -260,12 +284,15 @@ describe('Chart.helpers.canvas', function() { it('should set the text alignment', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {textAlign: 'left', textBaseline: 'middle'}); expect(context.getCalls()).toEqual([{ name: 'save', args: [], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'setTextAlign', args: ['left'], @@ -283,7 +310,7 @@ describe('Chart.helpers.canvas', function() { it('should translate and rotate text', function() { var context = window.createMockContext(); - var font = {fontString: '', lineHeight: 20}; + var font = {string: '12px arial', lineHeight: 20}; helpers.renderText(context, 'foo', 0, 0, font, {rotation: 90, translation: [10, 20]}); expect(context.getCalls()).toEqual([{ @@ -295,6 +322,9 @@ describe('Chart.helpers.canvas', function() { }, { name: 'rotate', args: [90], + }, { + name: 'setFont', + args: ['12px arial'], }, { name: 'fillText', args: ['foo', 0, 0, undefined], diff --git a/test/specs/plugin.title.tests.js b/test/specs/plugin.title.tests.js index fcfe104b0..29c0298f7 100644 --- a/test/specs/plugin.title.tests.js +++ b/test/specs/plugin.title.tests.js @@ -135,6 +135,9 @@ describe('Title block tests', function() { }, { name: 'rotate', args: [0] + }, { + name: 'setFont', + args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"], }, { name: 'setFillStyle', args: ['#666'] @@ -193,6 +196,9 @@ describe('Title block tests', function() { }, { name: 'rotate', args: [-0.5 * Math.PI] + }, { + name: 'setFont', + args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"], }, { name: 'setFillStyle', args: ['#666'] @@ -232,6 +238,9 @@ describe('Title block tests', function() { }, { name: 'rotate', args: [0.5 * Math.PI] + }, { + name: 'setFont', + args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"], }, { name: 'setFillStyle', args: ['#666'] diff --git a/test/specs/plugin.tooltip.tests.js b/test/specs/plugin.tooltip.tests.js index 987361e73..e07eae70f 100644 --- a/test/specs/plugin.tooltip.tests.js +++ b/test/specs/plugin.tooltip.tests.js @@ -1459,15 +1459,18 @@ describe('Plugin.Tooltip', function() { {name: 'setTextAlign', args: ['left']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['title', 105, 111]}, {name: 'setTextAlign', args: ['left']}, {name: 'setTextBaseline', args: ['middle']}, + {name: 'setFont', args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'setFillStyle', args: ['#fff']}, {name: 'setFillStyle', args: ['#fff']}, {name: 'fillText', args: ['label', 105, 129]}, {name: 'setTextAlign', args: ['left']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['footer', 105, 147]}, {name: 'restore', args: []} ])); @@ -1482,15 +1485,18 @@ describe('Plugin.Tooltip', function() { {name: 'setTextAlign', args: ['right']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['title', 195, 111]}, {name: 'setTextAlign', args: ['right']}, {name: 'setTextBaseline', args: ['middle']}, + {name: 'setFont', args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'setFillStyle', args: ['#fff']}, {name: 'setFillStyle', args: ['#fff']}, {name: 'fillText', args: ['label', 195, 129]}, {name: 'setTextAlign', args: ['right']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['footer', 195, 147]}, {name: 'restore', args: []} ])); @@ -1505,15 +1511,18 @@ describe('Plugin.Tooltip', function() { {name: 'setTextAlign', args: ['center']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['title', 150, 111]}, {name: 'setTextAlign', args: ['center']}, {name: 'setTextBaseline', args: ['middle']}, + {name: 'setFont', args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'setFillStyle', args: ['#fff']}, {name: 'setFillStyle', args: ['#fff']}, {name: 'fillText', args: ['label', 150, 129]}, {name: 'setTextAlign', args: ['center']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['footer', 150, 147]}, {name: 'restore', args: []} ])); @@ -1528,15 +1537,18 @@ describe('Plugin.Tooltip', function() { {name: 'setTextAlign', args: ['right']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['title', 195, 111]}, {name: 'setTextAlign', args: ['center']}, {name: 'setTextBaseline', args: ['middle']}, + {name: 'setFont', args: ["normal 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'setFillStyle', args: ['#fff']}, {name: 'setFillStyle', args: ['#fff']}, {name: 'fillText', args: ['label', 150, 129]}, {name: 'setTextAlign', args: ['left']}, {name: 'setTextBaseline', args: ['middle']}, {name: 'setFillStyle', args: ['#fff']}, + {name: 'setFont', args: ["bold 12px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif"]}, {name: 'fillText', args: ['footer', 105, 147]}, {name: 'restore', args: []} ]));