Merge pull request #3 from chartjs/use-correct-travis-init

GUI is initialized in before_install

Author: etimberg

.eslintrc.yml

@@ -1,11 +1,12 @@
 extends: chartjs
 
 parserOptions:
-  ecmaVersion: 5
-  sourceType: module
+  ecmaVersion: 2018
+  sourceType: 'module'
 
 env:
   browser: true
+  es6: true
   node: true
 
 rules:

.travis.yml

@@ -3,8 +3,13 @@ node_js:
   - lts/*
 
 before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - "export DISPLAY=:99.0"
+
+services:
+  - xvfb
+
+addons:
+  firefox: latest
 
 script:
   - gulp lint

test/.eslintrc.yml

@@ -0,0 +1,18 @@
+parserOptions:
+  ecmaVersion: 6
+
+env:
+  es6: true # also changes default ecmaVersion to 6
+  jasmine: true
+
+globals:
+  acquireChart: true
+  Chart: true
+  moment: true
+  waitForResize: true
+
+# https://eslint.org/docs/rules/
+rules:
+  # Best Practices
+  complexity: 0
+  max-statements: 0

test/utils.js

@@ -13,13 +13,13 @@ function acquireChart(config, options) {
 	options.wrapper = options.wrapper || { class: 'chartjs-wrapper' };
 
 	for (key in options.canvas) {
-		if (options.canvas.hasOwnProperty(key)) {
+		if (Object.prototype.hasOwnProperty.call(options.canvas, key)) {
 			canvas.setAttribute(key, options.canvas[key]);
 		}
 	}
 
 	for (key in options.wrapper) {
-		if (options.wrapper.hasOwnProperty(key)) {
+		if (Object.prototype.hasOwnProperty.call(options.wrapper, key)) {
 			wrapper.setAttribute(key, options.wrapper[key]);
 		}
 	}