Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

.eslintrc.js

@@ -10,7 +10,8 @@ module.exports = {
 
   env: {
     es6: true,
-    node: true
+    node: true,
+    mocha: true
   },
 
   plugins: ['vue'],
@@ -25,10 +26,6 @@ module.exports = {
     require: true
   },
 
-  env: {
-    mocha: true
-  },
-
   rules: {
     'accessor-pairs': 2,
     'arrow-spacing': [2, { 'before': true, 'after': true }],