From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sat, 18 Jan 2020 00:13:38 +0000 (-0800)
Subject: Use import statements in test code (#6977)
X-Git-Tag: v3.0.0-alpha~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac507819f7ab4838f1d8b423d803232be93987d;p=thirdparty%2FChart.js.git

Use import statements in test code (#6977)
---

diff --git a/src/adapters/adapter.moment.js b/src/adapters/adapter.moment.js
index 79ecaa236..56c5368e2 100644
--- a/src/adapters/adapter.moment.js
+++ b/src/adapters/adapter.moment.js
@@ -2,10 +2,10 @@
 
 'use strict';
 
-var moment = require('moment');
-var adapters = require('../core/core.adapters');
+import moment from 'moment';
+import adapters from '../core/core.adapters';
 
-var FORMATS = {
+const FORMATS = {
 	datetime: 'MMM D, YYYY, h:mm:ss a',
 	millisecond: 'h:mm:ss.SSS a',
 	second: 'h:mm:ss a',
diff --git a/src/adapters/index.js b/src/adapters/index.js
index d072f85cd..53dc150ae 100644
--- a/src/adapters/index.js
+++ b/src/adapters/index.js
@@ -7,4 +7,4 @@
 
 // Built-in moment adapter that we need to keep for backward compatibility
 // https://github.com/chartjs/Chart.js/issues/5542
-require('./adapter.moment');
+import './adapter.moment';
diff --git a/src/core/core.adapters.js b/src/core/core.adapters.js
index f87cf43de..081255cef 100644
--- a/src/core/core.adapters.js
+++ b/src/core/core.adapters.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-var helpers = require('../helpers/index');
+import helpers from '../helpers';
 
 function abstract() {
 	throw new Error(
@@ -105,4 +105,6 @@ DateAdapter.override = function(members) {
 	helpers.extend(DateAdapter.prototype, members);
 };
 
-module.exports._date = DateAdapter;
+export default {
+	_date: DateAdapter
+};
diff --git a/test/fixture.js b/test/fixture.js
index 5652c13e9..745f0bdbd 100644
--- a/test/fixture.js
+++ b/test/fixture.js
@@ -2,7 +2,7 @@
 
 'use strict';
 
-var utils = require('./utils');
+import utils from './utils';
 
 function readFile(url, callback) {
 	var request = new XMLHttpRequest();
@@ -79,7 +79,6 @@ function specsFromFixtures(path) {
 	};
 }
 
-module.exports = {
+export default {
 	specs: specsFromFixtures
 };
-
diff --git a/test/index.js b/test/index.js
index a7ac0459e..470ec7ce1 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var fixture = require('./fixture');
-var Context = require('./context');
-var matchers = require('./matchers');
-var utils = require('./utils');
+import fixture from './fixture';
+import Context from './context';
+import matchers from './matchers';
+import utils from './utils';
 
 (function() {
 
diff --git a/test/matchers.js b/test/matchers.js
index 92a6f9704..7f1bcf55f 100644
--- a/test/matchers.js
+++ b/test/matchers.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var pixelmatch = require('pixelmatch');
-var utils = require('./utils');
+import pixelmatch from 'pixelmatch';
+import utils from './utils';
 
 function toPercent(value) {
 	return Math.round(value * 10000) / 100;
@@ -196,7 +196,7 @@ function toEqualImageData() {
 	};
 }
 
-module.exports = {
+export default {
 	toBeCloseToPixel: toBeCloseToPixel,
 	toEqualOneOf: toEqualOneOf,
 	toBeValidChart: toBeValidChart,