From e756d73a4cd11a7ee8918710e4bf70c61dee5566 Mon Sep 17 00:00:00 2001
From: Ville Immonen <ville.immonen@iki.fi>
Date: Thu, 13 Oct 2016 00:29:50 +0300
Subject: [PATCH] Add Yarn to the e2e test

Run tests both with and without Yarn installed.
---
 .travis.yml  | 3 +++
 tasks/e2e.sh | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 75383b8780..ec44c3294d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,3 +9,6 @@ cache:
   - packages/create-react-app/node_modules
   - packages/react-scripts/node_modules
 script: tasks/e2e.sh
+env:
+  - USE_YARN=no
+  - USE_YARN=yes
diff --git a/tasks/e2e.sh b/tasks/e2e.sh
index 88e1fdf4e2..094fba9e22 100755
--- a/tasks/e2e.sh
+++ b/tasks/e2e.sh
@@ -53,6 +53,12 @@ set -x
 cd ..
 root_path=$PWD
 
+if [ "$USE_YARN" = "yes" ]
+then
+  # Install Yarn so that the test can use it to install packages.
+  npm install -g yarn
+fi
+
 npm install
 
 # Lint own code