From ad6ba1ab9c920348f8dc0ce8eb4b6e0536016633 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Mon, 11 Jun 2018 15:54:43 -0700 Subject: [PATCH 1/3] Update nvm, node, and yarn in vagrant --- scripts/vagrant-linux-priv-ui.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vagrant-linux-priv-ui.sh b/scripts/vagrant-linux-priv-ui.sh index 3bcabc4fb..c661b9d3a 100755 --- a/scripts/vagrant-linux-priv-ui.sh +++ b/scripts/vagrant-linux-priv-ui.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Install NVM for simple node.js version management -wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash +wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash # This enables NVM without a logout/login export NVM_DIR="/home/vagrant/.nvm" @@ -9,10 +9,10 @@ export NVM_DIR="/home/vagrant/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm # Install Node, Ember CLI, and Phantom for UI development -nvm install 6.11.0 -nvm alias default 6.11.0 -npm install -g ember-cli phantomjs-prebuilt +nvm install 8.11.2 +nvm alias default 8.11.2 +npm install -g ember-cli # Install Yarn for front-end dependency management -curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.24.6 +curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0 export PATH="$HOME/.yarn/bin:\$PATH" From 7f36eb37c75574b2fe23f1fedbba8e8157f1e3bb Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Mon, 11 Jun 2018 15:54:58 -0700 Subject: [PATCH 2/3] Remove phantomjs call from the makefile --- GNUmakefile | 1 - 1 file changed, 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index e6dcbfd9b..d5a5e37f8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -288,7 +288,6 @@ test-ui: ## Run Nomad UI test suite @cd ui && npm rebuild node-sass @cd ui && yarn install @echo "--> Running ember tests" - @cd ui && phantomjs --version @cd ui && npm test .PHONY: ember-dist From adf7f083e554257b29a6866724834c06628e9cc9 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Tue, 12 Jun 2018 16:34:44 -0700 Subject: [PATCH 3/3] Add chrome to the ui vagrant machine It's used for running acceptance tests --- scripts/vagrant-linux-priv-ui.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/vagrant-linux-priv-ui.sh b/scripts/vagrant-linux-priv-ui.sh index c661b9d3a..b6af330b9 100755 --- a/scripts/vagrant-linux-priv-ui.sh +++ b/scripts/vagrant-linux-priv-ui.sh @@ -15,4 +15,9 @@ npm install -g ember-cli # Install Yarn for front-end dependency management curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0 -export PATH="$HOME/.yarn/bin:\$PATH" + +# Install Chrome for running tests (in headless mode) +wget -qO- - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - +sudo sh -c 'echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' +sudo apt-get update +sudo apt-get install -y google-chrome-stable