From 509ae4cea4d7c5ff8654089c528965876c0449a5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 9 Jan 2019 15:02:20 +0100
Subject: [PATCH 1/3] run unit tests on riot-web like before

---
 scripts/travis/unit-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/travis/unit-tests.sh b/scripts/travis/unit-tests.sh
index a8e0a63b31..a2f0d61112 100755
--- a/scripts/travis/unit-tests.sh
+++ b/scripts/travis/unit-tests.sh
@@ -6,5 +6,9 @@
 
 set -ev
 
+RIOT_WEB_DIR=riot-web
+
 scripts/travis/build.sh
+pushd "$RIOT_WEB_DIR"
 npm run test
+popd

From 45558f5323277763f9239a128138f5ac0a790227 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 9 Jan 2019 15:16:20 +0100
Subject: [PATCH 2/3] run both react-sdk and riot-web tests

---
 .travis.yml                       |  3 +++
 scripts/travis/riot-unit-tests.sh | 14 ++++++++++++++
 scripts/travis/unit-tests.sh      |  4 ----
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 scripts/travis/riot-unit-tests.sh

diff --git a/.travis.yml b/.travis.yml
index bfc4d265a4..0746cc0dff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,3 +30,6 @@ matrix:
         - name: Unit Tests
           script:
             - ./scripts/travis/unit-tests.sh
+        - name: Riot-web Unit Tests
+          script:
+            - ./scripts/travis/riot-unit-tests.sh
diff --git a/scripts/travis/riot-unit-tests.sh b/scripts/travis/riot-unit-tests.sh
new file mode 100644
index 0000000000..a2f0d61112
--- /dev/null
+++ b/scripts/travis/riot-unit-tests.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# script which is run by the travis build (after `npm run test`).
+#
+# clones riot-web develop and runs the tests against our version of react-sdk.
+
+set -ev
+
+RIOT_WEB_DIR=riot-web
+
+scripts/travis/build.sh
+pushd "$RIOT_WEB_DIR"
+npm run test
+popd
diff --git a/scripts/travis/unit-tests.sh b/scripts/travis/unit-tests.sh
index a2f0d61112..a8e0a63b31 100755
--- a/scripts/travis/unit-tests.sh
+++ b/scripts/travis/unit-tests.sh
@@ -6,9 +6,5 @@
 
 set -ev
 
-RIOT_WEB_DIR=riot-web
-
 scripts/travis/build.sh
-pushd "$RIOT_WEB_DIR"
 npm run test
-popd

From 19190deb3c9e1c556eff26da492a588a1ff6bd85 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 9 Jan 2019 15:20:55 +0100
Subject: [PATCH 3/3] set x perms

---
 scripts/travis/riot-unit-tests.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/travis/riot-unit-tests.sh

diff --git a/scripts/travis/riot-unit-tests.sh b/scripts/travis/riot-unit-tests.sh
old mode 100644
new mode 100755