Use import statements in test code (#6977)

diff --git a/src/adapters/adapter.moment.js b/src/adapters/adapter.moment.js
index 79ecaa23682011f46efde3ea3b3934b4608a010d..56c5368e28c3c7dbd998e6c2cc790c73062d19f7 100644 (file)
--- 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 d072f85cdf6117f2d044c79f23d41c7a481bbebf..53dc150ae7c7097a8bfbc2abcaaa57de5d335ee4 100644 (file)
--- 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 f87cf43ded4e7a40c475bad64000f79fcea1ed10..081255cef0e7d27b982e273ea9d6f7fcae0d813c 100644 (file)
--- 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 5652c13e9449560e3b915e5751c78281c7bd1dbd..745f0bdbd9c3a5414c823c0bf5d45bff43a34f1a 100644 (file)
--- 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 a7ac0459e868246dfe4e14e67b89910ac29f4373..470ec7ce17e0edf9ac83c2a5a4000ef13573495b 100644 (file)
--- 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 92a6f970427fc8af667a3ac253c024f69500253f..7f1bcf55f511b790ef4ff2952f8889c62992d553 100644 (file)
--- 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,