update wats npm deps and revisit dev dependencies

* ava now requires test helpers to live at a specific `helpers` path
* no more `yarn watch`/`chokidar-cli` dependency
* pre-release versions of elm-test and elm-analyse to use newest lodash

Signed-off-by: Jamie Klassen <cklassen@pivotal.io>
Co-authored-by: James Thomson <jthomson@pivotal.io>

CONTRIBUTING.md

@@ -169,16 +169,6 @@ $ yarn build
 When new assets are built locally, they will automatically propagate to the
 `web` container without requiring a restart.
 
-For a quicker feedback cycle, you'll probably want to use `watch` instead of
-`build`:
-
-```sh
-$ yarn watch
-```
-
-This will continuously monitor your local `.elm`/`.less` files and run `yarn
-build` whenever they change.
-
 ### Debugging with `dlv`
 
 With concourse already running, during local development is possible to attach

package.json

@@ -8,12 +8,11 @@
   "devDependencies": {
     "@mdi/svg": "^3.5.95",
     "child-process-promise": "^2.2.1",
-    "chokidar-cli": "^1.2.1",
     "clean-css-cli": "^4.3.0",
     "elm": "^0.19.0-bugfix6",
-    "elm-analyse": "^0.16.2",
+    "elm-analyse": "stil4m/elm-analyse#1ced133fa266fca45027e007e573badedb62a225",
     "elm-format": "0.8.1",
-    "elm-test": "^0.19.0-rev6",
+    "elm-test": "rtfeldman/node-test-runner#79cefc998411f997141d5f2023a369b43548caf0",
     "less": "^3.0.2",
     "less-plugin-autoprefix": "^1.5.1",
     "puppeteer": "^1.12.2",
@@ -31,7 +30,6 @@
     "build-less": "lessc web/assets/css/main.less web/public/main.out.css && cleancss -o web/public/main.css web/public/main.out.css && rm web/public/main.out.css",
     "build-elm": "cd web/elm && elm make --optimize --output ../public/elm.js src/Main.elm && uglifyjs ../public/elm.js --compress 'pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe' | uglifyjs --mangle --output=../public/elm.min.js",
     "build-elm-debug": "cd web/elm && elm make --output ../public/elm.js src/Main.elm && uglifyjs < ../public/elm.js > ../public/elm.min.js",
-    "watch": "chokidar -i elm-stuff 'web/elm/src/**/*.elm' 'web/assets/css/*.less' -c 'yarn run build-debug' --initial",
     "update-mdi-svg": "./hack/update-mdi-svg \"node_modules/@mdi/svg/svg\" > web/public/mdi-svg.js && uglifyjs < web/public/mdi-svg.js > web/public/mdi-svg.min.js",
     "benchmark": "cd web/elm && elm make --optimize --output /tmp/benchmark.html benchmarks/Benchmarks.elm && node benchmarks/benchmark.js /tmp/benchmark.html"
   }

web/elm/benchmarks/benchmark.js

@@ -1,4 +1,4 @@
-const Web = require('../../wats/test/helpers/web');
+const Web = require('../../wats/helpers/web');
 
 class Benchmark {
   constructor() {

web/wats/package.json

@@ -3,12 +3,12 @@
   "version": "1.0.0",
   "description": "Concourse web UI acceptance tests",
   "dependencies": {
-    "ava": "^0.25.0",
+    "ava": "^2.2.0",
     "child-process-promise": "^2.2.1",
-    "color": "^2.0.0",
-    "puppeteer": "^1.12.2",
-    "tmp-promise": "^1.0.3",
-    "uuid": "^3.1.0"
+    "color": "^3.1.2",
+    "puppeteer": "^1.19.0",
+    "tmp-promise": "^2.0.2",
+    "uuid": "^3.3.2"
   },
   "devDependencies": {},
   "scripts": {

web/wats/test/build.js

@@ -1,9 +1,9 @@
 import test from 'ava';
 
-const Suite = require('./helpers/suite');
+const Suite = require('../helpers/suite');
 
 const color = require('color');
-const palette = require('./helpers/palette');
+const palette = require('../helpers/palette');
 
 test.beforeEach(async t => {
   t.context = new Suite();

web/wats/test/dashboard.js

@@ -1,12 +1,12 @@
 import test from 'ava';
-import Fly from './helpers/fly'
-import Web from './helpers/web'
+import Fly from '../helpers/fly'
+import Web from '../helpers/web'
 import puppeteer from 'puppeteer';
 
-const Suite = require('./helpers/suite');
+const Suite = require('../helpers/suite');
 
 const color = require('color');
-const palette = require('./helpers/palette');
+const palette = require('../helpers/palette');
 
 test.beforeEach(async t => {
   t.context = new Suite();
@@ -92,7 +92,7 @@ test('auto-refreshes to reflect state changes', showsPipelineState, async t => {
 }, async (t, text, background, group) => {
   t.deepEqual(background, palette.green);
 
-  await t.throws(t.context.fly.run("trigger-job -w -j some-pipeline/failing"));
+  await t.throwsAsync(async () => await t.context.fly.run("trigger-job -w -j some-pipeline/failing"));
 
   await t.context.web.page.waitFor(10000);
 

web/wats/test/login.js

@@ -1,6 +1,6 @@
 import test from 'ava';
-import Fly from './helpers/fly';
-import Web from './helpers/web';
+import Fly from '../helpers/fly';
+import Web from '../helpers/web';
 import puppeteer from 'puppeteer';
 
 test.beforeEach(async t => {

web/wats/test/resource.js

@@ -1,5 +1,5 @@
 import test from 'ava';
-import Suite from './helpers/suite';
+import Suite from '../helpers/suite';
 
 test.beforeEach(async t => {
   t.context = new Suite();

web/wats/test/smoke.js

@@ -1,6 +1,6 @@
 import test from 'ava';
 
-const Suite = require('./helpers/suite');
+const Suite = require('../helpers/suite');
 
 test.beforeEach(async t => {
   t.context = new Suite();