Merge branch 'develop' into feature/stylint

Author: gucong3000

docs/commands.md

@@ -39,4 +39,4 @@ All build commands are executed via [NPM Scripts](https://docs.npmjs.com/misc/sc
 
 ### `npm run lint`
 
-> Runs eslint and reports any linting errors in your code. See [Linter Configuration](linter.md)
+> Runs eslint and stylelint, then reports any linting errors in your code. See [Linter Configuration](linter.md)

docs/linter.md

@@ -28,3 +28,11 @@ If you are not happy with the default linting rules, you have several options:
   ```
 
 2. Pick "none" for stylelint preset when generating the project and define your own rules. See [Stylelint documentation](http://stylelint.io/user-guide/rules/) for more details.
+
+## Fixing Linting Errors
+
+You can run the following command to let eslint fix any errors it finds (if it can - not all errors are fixable like this):
+
+```
+npm run lint:fix
+```

docs/structure.md

@@ -34,9 +34,8 @@
 ├── .eslintignore.js            # eslint ignore rules
 ├── .gitignore                  # sensible defaults for gitignore
 ├── .postcssrc.js               # postcss config
-├── .eslintrc.js                # eslint config
 ├── .stylelintrc.js             # stylelint config
-├── .editorconfig               # editor config
+├── .stylelintignore            # stylelint ignore rules
 ├── index.html                  # index.html template
 ├── package.json                # build scripts and dependencies
 └── README.md                   # Default README file

template/test/e2e/custom-assertions/elementCount.js

@@ -18,8 +18,8 @@ exports.assertion = function (selector, count) {
   }
   this.command = function (cb) {
     var self = this{{#if_eq eslintConfig "airbnb"}};{{/if_eq}}
-    return this.api.execute(function (selectorToCount) {
-      return document.querySelectorAll(selectorToCount).length{{#if_eq eslintConfig "airbnb"}};{{/if_eq}}
+    return this.api.execute(function (selector) {
+      return document.querySelectorAll(selector).length{{#if_eq eslintConfig "airbnb"}};{{/if_eq}}
     }, [selector], function (res) {
       cb.call(self, res){{#if_eq eslintConfig "airbnb"}};{{/if_eq}}
     }){{#if_eq eslintConfig "airbnb"}};{{/if_eq}}