Fix e2e/CI issues

wix · Jun 2, 2019 · 84a6f64 · 84a6f64
1 parent bca1eba
commit 84a6f64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -1,5 +1,10 @@
 #!/bin/bash -e
 
+source $(dirname "$0")/logger.sh
+
+# Approve unapproved SDK licenses
+run_f "yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses"
+
 source $(dirname "$0")/ci.sh
 
 pushd detox/android