Merge remote-tracking branch 'origin/develop' into develop

.travis-test-riot.sh

@@ -10,7 +10,7 @@ RIOT_WEB_DIR=riot-web
 REACT_SDK_DIR=`pwd`
 
 scripts/fetchdep.sh vector-im riot-web
-cd "$RIOT_WEB_DIR"
+pushd "$RIOT_WEB_DIR"
 
 mkdir node_modules
 npm install
@@ -23,4 +23,16 @@ ln -s "$REACT_SDK_DIR/node_modules/matrix-js-sdk" node_modules/matrix-js-sdk
 rm -r node_modules/matrix-react-sdk
 ln -s "$REACT_SDK_DIR" node_modules/matrix-react-sdk
 
+npm run build
 npm run test
+popd
+
+# run end to end tests
+git clone https://github.com/matrix-org/matrix-react-end-to-end-tests.git --branch master
+pushd matrix-react-end-to-end-tests
+ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
+# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+# CHROME_PATH=$(which google-chrome-stable) ./run.sh
+./install.sh
+./run.sh
+popd

.travis.yml

@@ -15,5 +15,7 @@ addons:
     chrome: stable
 install:
     - npm install
+# install synapse prerequisites for end to end tests
+    - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev
 script:
     ./scripts/travis.sh