Testing updates

.eslintignore

@@ -1,6 +1 @@
-node_modules
-test/*
-Gruntfile.js
-dist
-webpack.config.js
-.eslintrc.js
+dist/*

.eslintrc.js

@@ -1,14 +1,17 @@
 module.exports = {
   env: {
-    browser: true
+    browser: true,
+    commonjs: true,
+    es6: true,
+    node: true,
   },
   extends: 'google',
   globals: {
     Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly'
+    SharedArrayBuffer: 'readonly',
   },
   parserOptions: {
-    ecmaVersion: 6
+    ecmaVersion: 6,
   },
   rules: {
     /*
@@ -26,17 +29,20 @@ module.exports = {
      */
 
     /* rules */
-    'arrow-parens': [2, 'as-needed', { 'requireForBlockBody': true }],
-    'block-spacing': ['error', 'always'],
-    'brace-style': ['off', '1tbs', { allowSingleLine: true }],
-    curly: ['error', 'multi-line'],
+    'arrow-parens': [2, 'as-needed', {requireForBlockBody: true}],
+    'block-spacing': [2, 'always'],
+    'brace-style': ['off', '1tbs', {allowSingleLine: true}],
+    'comma-style': [2, 'last'],
+    'curly': [2, 'multi-line'],
     'guard-for-in': 0,
-    'linebreak-style': ['error', 'unix'],
-    'max-len': ['warn', { ignoreComments: true }],
+    'linebreak-style': [2, 'unix'],
+    'max-len': ['warn', {ignoreComments: true, ignoreStrings: true, tabWidth: 2}],
     'new-cap': 0,
+    'no-trailing-spaces': 2,
     'no-var': 0,
     'prefer-const': 1,
+    'quotes': [2, 'single'],
     'require-jsdoc': 0,
     'valid-jsdoc': 0,
-  }
+  },
 };

CONTRIBUTING.md

@@ -55,8 +55,7 @@ We use SVG for our icon system. Please visit our wiki [SVG Icon System](https://
 
 ### Testing
 
-[Guide](TESTING.md) on testing LDI.
-
+[Guide](https://github.com/publiclab/Leaflet.DistortableImage/wiki/Testing) on testing LDI.
 
 ## Bug reports & troubleshooting
 

Gruntfile.js

@@ -2,66 +2,28 @@ const webpackConfig = require('./webpack.config.js');
 
 module.exports = function(grunt) {
   // load npm tasks for grunt-* libs, excluding grunt-cli
-  require('matchdep').filterDev('grunt-*').filter(function(pkg) {
+  require('matchdep').filterDev('{grunt,gruntify}-*').filter(function(pkg) {
     return ['grunt-cli'].indexOf(pkg) < 0;
   }).forEach(grunt.loadNpmTasks);
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
     webpack: {
-      myConfig: webpackConfig
+      myConfig: webpackConfig,
     },
 
-    jshint: {
-      options: {
-        node: true,
-        browser: true,
-        esversion: 6,
-        mocha: true,
-        typed: true,
-        bitwise: true,
-        curly: true,
-        eqeqeq: true,
-        latedef: true,
-        noarg: true,
-        regexp: true,
-        undef: true,
-        globals: {
-          L: false,
-          LeafletToolbar: false,
-          warpWebGl: false,
-          EXIF: false,
-          alert: false,
-
-          // Mocha
-
-          describe: false,
-          it: false,
-          before: false,
-          after: false,
-          beforeEach: false,
-          afterEach: false,
-          chai: false,
-          expect: false,
-          sinon: false
-        }
-      },
-      source: {
-        src: ['src/**/*.js', 'package.json']
-      },
-      grunt: {
-        src: ['Gruntfile.js']
-      }
+    eslint: {
+      src: ['src/**/*.js', 'test/**/*.js'],
     },
 
     karma: {
       development: {
-        configFile: 'test/karma.conf.js'
+        configFile: 'test/karma.conf.js',
       },
       test: {
-        configFile: 'test/karma.conf.js'
-      }
+        configFile: 'test/karma.conf.js',
+      },
     },
 
     // Minify SVGs from svg directory, output to svg-min
@@ -73,9 +35,9 @@ module.exports = function(grunt) {
             cwd: 'assets/icons/svg',
             src: ['*.svg'],
             dest: 'assets/icons/svg-min/',
-            ext: '.svg'
-          }
-        ]
+            ext: '.svg',
+          },
+        ],
       },
       options: {
         plugins: [
@@ -84,11 +46,11 @@ module.exports = function(grunt) {
           { removeTitle: true }, // "leaflet-toolbar" lets us specify the title attribute later
           {
             removeAttrs: {
-              attrs: ['xmlns', 'fill']
-            }
-          }
-        ]
-      }
+              attrs: ['xmlns', 'fill'],
+            },
+          },
+        ],
+      },
     },
 
     svg_sprite: {
@@ -105,29 +67,29 @@ module.exports = function(grunt) {
           mode: {
             symbol: {
               sprite: 'sprite.symbol.svg',
-              example: true
-            }
-          }
-        }
-      }
+              example: true,
+            },
+          },
+        },
+      },
     },
 
     watch: {
       options: {
-        livereload: true
+        livereload: true,
       },
       source: {
         files: ['src/**/*.js', 'test/**/*.js', 'Gruntfile.js'],
-        tasks: ['jshint', 'karma:development:start']
-      }
-    }
+        tasks: ['eslint', 'karma:development:start'],
+      },
+    },
   });
 
   /* Run tests once. */
-  grunt.registerTask('test', ['jshint', 'karma:test']);
+  grunt.registerTask('test', ['eslint', 'karma:test']);
 
   grunt.registerTask('build', [
-    'jshint',
+    'eslint',
     'karma:development:start',
     'coverage',
     'webpack',
@@ -136,7 +98,7 @@ module.exports = function(grunt) {
   // recompile svg icon sprite
   grunt.registerTask('icons', ['svgmin', 'svg_sprite']);
 
-  grunt.registerTask('coverage', 'Custom commmand-line reporter for karma-coverage', function() {
+  grunt.registerTask('coverage', 'CLI reporter for karma-coverage', function() {
     var coverageReports = grunt.file.expand('coverage/*/coverage.txt');
     var reports = {};
     var report; var i; var len;