From c69cac075751f0d72c4790fed7781824f6065501 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Wed, 13 Mar 2019 14:17:17 +0100
Subject: [PATCH] Update GitLab config

---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 242397a9..d645e9bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,18 +38,18 @@ assembleDebug:
     paths:
     - app/build/outputs/
 
-instrumentation_tests:
+instrumentationTests:
   stage: test
   script:
-    - emulator -avd testAVD -no-audio -no-window &
-    - ./ci/android-wait-for-emulator.sh
-    - adb devices
-    - adb shell settings put global window_animation_scale 0 &
-    - adb shell settings put global transition_animation_scale 0 &
-    - adb shell settings put global animator_duration_scale 0 &
-    - adb shell input keyevent 82 &
-    - ./gradlew connectedAndroidTest
-    - ./ci/stop-emulators.sh
+    - wget --quiet --output-document=android-wait-for-emulator https://raw.githubusercontent.com/travis-ci/travis-cookbooks/0f497eb71291b52a703143c5cd63a217c8766dc9/community-cookbooks/android-sdk/files/default/android-wait-for-emulator
+    - chmod +x android-wait-for-emulator
+    - echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "system-images;android-${ANDROID_COMPILE_SDK};google_apis_playstore;x86"
+    - echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --update
+    - echo no | ${ANDROID_HOME}/tools/bin/avdmanager create avd -k "system-images;android-${ANDROID_COMPILE_SDK};google_apis_playstore;x86" -n test
+    - ${ANDROID_HOME}/tools/emulator -avd test -no-window -no-audio 
+    - ./android-wait-for-emulator
+    - adb shell input keyevent 82
+    - ./gradlew cAT
   artifacts:
     name: "reports_${CI_PROJECT_NAME}_${CI_BUILD_REF_NAME}"
     when: on_failure