From 45e748233594aae9e78ed377118e9664aa5f67e0 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 28 Feb 2018 11:45:10 +0000
Subject: [PATCH 1/3] Install chai-expect and chai-friendly eslint plugins

---
 services/web/npm-shrinkwrap.json | 12 ++++++++++++
 services/web/package.json        |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json
index 1cce956554..2b7714dd4e 100644
--- a/services/web/npm-shrinkwrap.json
+++ b/services/web/npm-shrinkwrap.json
@@ -2981,6 +2981,18 @@
         }
       }
     },
+    "eslint-plugin-chai-expect": {
+      "version": "1.1.1",
+      "from": "eslint-plugin-chai-expect@latest",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-1.1.1.tgz",
+      "dev": true
+    },
+    "eslint-plugin-chai-friendly": {
+      "version": "0.4.1",
+      "from": "eslint-plugin-chai-friendly@latest",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.4.1.tgz",
+      "dev": true
+    },
     "eslint-plugin-import": {
       "version": "2.9.0",
       "from": "eslint-plugin-import@>=2.9.0 <3.0.0",
diff --git a/services/web/package.json b/services/web/package.json
index 9d060afead..ffb75186b7 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -102,6 +102,8 @@
     "eslint": "^4.18.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-loader": "^1.9.0",
+    "eslint-plugin-chai-expect": "^1.1.1",
+    "eslint-plugin-chai-friendly": "^0.4.1",
     "eslint-plugin-import": "^2.9.0",
     "eslint-plugin-node": "^6.0.0",
     "eslint-plugin-promise": "^3.6.0",

From 6f58c600260877f14048684180923f975cc4b975 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 28 Feb 2018 11:45:30 +0000
Subject: [PATCH 2/3] Configure eslint to be more friendly to chai assertions

---
 services/web/.eslintrc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/services/web/.eslintrc b/services/web/.eslintrc
index 38d2ce50bb..ad91e45362 100644
--- a/services/web/.eslintrc
+++ b/services/web/.eslintrc
@@ -1,9 +1,21 @@
 {
   "extends": ["standard"],
+  "plugins": [
+    "chai-expect",
+    "chai-friendly"
+  ],
   "env": {
     "mocha": true
   },
   "globals": {
     "expect": true
+  },
+  "rules": {
+    // Add some chai specific rules
+    "chai-expect/missing-assertion": "error",
+    "chai-expect/terminating-properties": "error",
+    // Swap the no-unused-expressions rule with a more chai-friendly one
+    "no-unused-expressions": 0,
+    "chai-friendly/no-unused-expressions": "error"
   }
 }
\ No newline at end of file

From 7ea164ef776e012bd54bb4ca8a6ca478976a0fa3 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 28 Feb 2018 12:15:24 +0000
Subject: [PATCH 3/3] Add max line length rule, defaults to 80 chars

---
 services/web/.eslintrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/web/.eslintrc b/services/web/.eslintrc
index ad91e45362..3d0b68ae71 100644
--- a/services/web/.eslintrc
+++ b/services/web/.eslintrc
@@ -11,6 +11,8 @@
     "expect": true
   },
   "rules": {
+    "max-len": "error",
+
     // Add some chai specific rules
     "chai-expect/missing-assertion": "error",
     "chai-expect/terminating-properties": "error",