Merge remote-tracking branch 'origin/master' into wait

Author: chrisbreiding

.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "plugin:cypress-dev/general"
+  ]
+}

circle.yml

@@ -1,7 +1,26 @@
-machine:
-  node:
-    # need Node 8 for latest semantic release
-    version: 8
-test:
-  override:
-    - npm run semantic-release || true
+version: 2
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - test
+
+jobs:
+  test:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: npm install
+      - run:
+          name: Lint code
+          command: npm run lint
+      - run:
+          name: Run tests
+          command: npm test
+      - run:
+          name: Semantic release
+          command: npm run semantic-release || true

index.js

@@ -3,10 +3,10 @@ const globals = require('globals')
 module.exports = {
   rules: {
     'no-assigning-return-values': require('./lib/rules/no-assigning-return-values'),
-    'no-unnecessary-waiting': require('./lib/rules/no-unnecessary-waiting')
+    'no-unnecessary-waiting': require('./lib/rules/no-unnecessary-waiting'),
   },
   configs: {
-    recommended: require('./lib/config/recommended')
+    recommended: require('./lib/config/recommended'),
   },
   environments: {
     globals: {