From 0e5c0d2f2c8ce4b5ce106d80de89f65f4ee07200 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Wed, 19 Oct 2016 07:47:47 -0700
Subject: [PATCH] test refurb: removed xcpretty on travis + using yarn + e2e
 tests

Summary:
- switched to yarn on travis (experimental)
- removed xcpretty, we need more verbose logs
- returned jest test for e2e
Closes https://github.com/facebook/react-native/pull/10442

Differential Revision: D4043991

Pulled By: davidaurelio

fbshipit-source-id: 50062f6a77a17643bf9a7ba7add8cee5b3bb26d2
---
 .travis.yml          |  6 +++---
 scripts/objc-test.sh | 26 ++++++--------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1954e42635d..006eca2d950 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ install:
   # TODO npm 2 started stalling on Travis, t11852928
   - nvm install 5
   - rm -Rf "${TMPDIR}/jest_preprocess_cache"
-  - npm config set spin=false
-  - npm config set progress=false
-  - travis_wait npm install
+  - wget https://github.com/yarnpkg/yarn/releases/download/v0.16.0/yarn-0.16.0.js
+  - export yarn="node $(pwd)/yarn-0.16.0.js"
+  - $yarn install
 
 script:
   - if [[ "$TEST_TYPE" = objc-ios ]]; then travis_retry travis_wait ./scripts/objc-test-ios.sh; fi
diff --git a/scripts/objc-test.sh b/scripts/objc-test.sh
index d827f13b0c1..327e0f8572b 100755
--- a/scripts/objc-test.sh
+++ b/scripts/objc-test.sh
@@ -28,26 +28,12 @@ function cleanup {
 }
 trap cleanup EXIT
 
-# Support for environments without xcpretty installed
-set +e
-OUTPUT_TOOL=$(which xcpretty)
-set -e
-
 # TODO: We use xcodebuild because xctool would stall when collecting info about
 # the tests before running them. Switch back when this issue with xctool has
 # been resolved.
-if [ -z "$OUTPUT_TOOL" ]; then
-  xcodebuild \
-    -project $XCODE_PROJECT \
-    -scheme $XCODE_SCHEME \
-    -sdk $XCODE_SDK \
-    -destination "$XCODE_DESTINATION" \
-    test
-else
-  xcodebuild \
-    -project $XCODE_PROJECT \
-    -scheme $XCODE_SCHEME \
-    -sdk $XCODE_SDK \
-    -destination "$XCODE_DESTINATION" \
-    test | $OUTPUT_TOOL && exit ${PIPESTATUS[0]}
-fi
+xcodebuild \
+  -project $XCODE_PROJECT \
+  -scheme $XCODE_SCHEME \
+  -sdk $XCODE_SDK \
+  -destination "$XCODE_DESTINATION" \
+  build test