From 4a01be47cd3f598d6db0c4998a542d764dd06471 Mon Sep 17 00:00:00 2001
From: Eric Lewis <ericlewis777@gmail.com>
Date: Wed, 20 Feb 2019 21:47:56 -0800
Subject: [PATCH] Fix iOS e2e test (#23566)

Summary:
As part of #23561 this is an attempt at fixing iOS.

[iOS] [Fixed] - e2e test
Pull Request resolved: https://github.com/facebook/react-native/pull/23566

Differential Revision: D14162780

Pulled By: cpojer

fbshipit-source-id: b55d32e30f88370100f7fbddf9dfb208280844f4
---
 .circleci/config.yml        |  8 +++++---
 scripts/run-ci-e2e-tests.js | 12 ++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bdb73f0e7723fe..c4236d44d71eaf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -241,6 +241,10 @@ aliases:
     name: iOS Test Suite
     command: ./scripts/objc-test-ios.sh test
 
+  - &run-objc-ios-e2e-tests
+    name: iOS End-to-End Test Suite
+    command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
+
   - &display-broken-tests-warning
     name: Running broken tests (Ignore any failures past this point)
     command: |
@@ -255,9 +259,6 @@ aliases:
   - &run-e2e-tests
     name: End-to-End Test Suite
     command: ./scripts/run-ci-e2e-tests.js --android --ios --js --retries 3;
-  - &run-objc-ios-e2e-tests
-    name: iOS End-to-End Test Suite
-    command: node ./scripts/run-ci-e2e-tests.js --ios --retries 3;
   - &run-android-e2e-tests
     name: Android End-to-End Test Suite
     command: node ./scripts/run-ci-e2e-tests.js --android --retries 3;
@@ -367,6 +368,7 @@ jobs:
       - restore-cache: *restore-cache-homebrew
       - run: *brew-install-watchman
       - save-cache: *save-cache-homebrew
+      - run: *run-objc-ios-e2e-tests
       - run: *run-objc-ios-tests
 
       - store_test_results:
diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js
index 556211ff51b4ac..ee50ad713d8172 100644
--- a/scripts/run-ci-e2e-tests.js
+++ b/scripts/run-ci-e2e-tests.js
@@ -47,15 +47,7 @@ let exitCode;
 
 try {
   // install CLI
-  cd('react-native-cli');
-  exec('yarn pack');
-  const CLI_PACKAGE = path.join(
-    ROOT,
-    'react-native-cli',
-    'react-native-cli-*.tgz',
-  );
-  cd('..');
-
+  const CLI_PACKAGE = 'react-native-cli';
   if (!argv['skip-cli-install']) {
     if (exec(`sudo yarn global add ${CLI_PACKAGE}`).code) {
       echo('Could not install react-native-cli globally.');
@@ -197,7 +189,7 @@ try {
     if (
       tryExecNTimes(() => {
         exec('sleep 10s');
-        let destination = 'platform=iOS Simulator,name=iPhone 5s,OS=11.4';
+        let destination = 'platform=iOS Simulator,name=iPhone 5s,OS=12.1';
         let sdk = 'iphonesimulator';
         let scheme = 'EndToEndTest';