From 7d1048258109f1f227f5633e338628ebd17e46c5 Mon Sep 17 00:00:00 2001
From: Amit Davidi <amit.d4vidi@gmail.com>
Date: Sun, 2 Jun 2019 10:50:22 +0300
Subject: [PATCH] Fix e2e/CI issues

---
 detox/test/e2e/03.fs-scroll-actions.test.js | 6 +++++-
 scripts/ci.android.sh                       | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/detox/test/e2e/03.fs-scroll-actions.test.js b/detox/test/e2e/03.fs-scroll-actions.test.js
index 1dd32b75de..d6301aef7b 100644
--- a/detox/test/e2e/03.fs-scroll-actions.test.js
+++ b/detox/test/e2e/03.fs-scroll-actions.test.js
@@ -30,7 +30,11 @@ describe('Fullscreen scrolling Actions', () => {
     await expect(scrollViewDriver.firstItem()).toBeVisible();
     await expect(scrollViewDriver.lastItem()).toBeNotVisible();
 
-    await scrollViewDriver.scrollBy(1000);
+    try {
+      await scrollViewDriver.scrollBy(1000);
+    } catch (error) {
+      console.log('Expected error caught: Scrolled the list down to its very end');
+    }
     await expect(scrollViewDriver.firstItem()).toBeNotVisible();
     await expect(scrollViewDriver.lastItem()).toBeVisible();
   });
diff --git a/scripts/ci.android.sh b/scripts/ci.android.sh
index c638468f8f..fdb506e797 100755
--- a/scripts/ci.android.sh
+++ b/scripts/ci.android.sh
@@ -1,5 +1,8 @@
 #!/bin/bash -e
 
+# Approve unapproved SDK licenses
+("yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses")
+
 source $(dirname "$0")/ci.sh
 
 pushd detox/android