From 4e740968348ea52a97a1b9a579b61c58aae7dcbc Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Wed, 13 Dec 2017 17:04:15 -0800
Subject: [PATCH] Lock down yarn version

---
 .travis.yml | 6 ++----
 GNUmakefile | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 258b59a16..3a9791d32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,13 +28,11 @@ matrix:
     - os: osx
   fast_finish: true
 
-cache:
-  directories:
-    - ui/node_modules
-
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi
+  - if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 ; fi
+  - if [[ "$RUN_UI_TESTS" ]]; then export PATH="$HOME/.yarn/bin:$PATH" ; fi
 
 install:
   - if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi
diff --git a/GNUmakefile b/GNUmakefile
index 3c9741a71..951e7a81b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -283,8 +283,8 @@ static-assets: ## Compile the static routes to serve alongside the API
 .PHONY: test-ui
 test-ui: ## Run Nomad UI test suite
 	@echo "--> Installing JavaScript assets"
+	@cd ui && npm rebuild node-sass
 	@cd ui && yarn install
-	@cd ui && npm install phantomjs-prebuilt
 	@echo "--> Running ember tests"
 	@cd ui && phantomjs --version
 	@cd ui && npm test