From 730512bc3f26d3b0106ce76ce9b29b7f0bc1e128 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 2 May 2018 10:58:43 +0100
Subject: [PATCH] Use the right js-sdk branch when testing

On the react-sdk tests not just riot-web
---
 .travis-test-riot.sh | 9 +--------
 scripts/travis.sh    | 4 ++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index 87200871a5..eeba4d0b7e 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -9,16 +9,9 @@ set -ev
 RIOT_WEB_DIR=riot-web
 REACT_SDK_DIR=`pwd`
 
-curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
-echo "Determined branch to be $curbranch"
-
-git clone https://github.com/vector-im/riot-web.git \
-    "$RIOT_WEB_DIR"
-
+scripts/fetchdep.sh vector-im riot-web
 cd "$RIOT_WEB_DIR"
 
-git checkout "$curbranch" || git checkout develop
-
 mkdir node_modules
 npm install
 
diff --git a/scripts/travis.sh b/scripts/travis.sh
index c4a06c1bd1..7c96a02eb5 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -2,6 +2,10 @@
 
 set -ex
 
+scripts/fetchdep.sh matrix-org matrix-js-sdk
+rm -r node_modules/matrix-js-sdk || true
+ln -s matrix-js-sdk node_modules/matrix-js-sdk
+
 npm run test
 ./.travis-test-riot.sh