Rebase and pod update

facebook · Dec 7, 2020 · 195defa · 195defa
1 parent 2e6eea8
commit 195defa
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -796,17 +796,17 @@ workflows:
           run_unit_tests: true
           requires:
             - setup_ios
-      # - test_ios:
-      #     name: test_ios_detox
-      #     run_detox_tests: true
-      #     requires:
-      #       - setup_ios
-      # - test_ios:
-      #     name: test_ios_detox_frameworks
-      #     use_frameworks: true
-      #     run_detox_tests: true
-      #     requires:
-      #       - setup_ios
+      - test_ios:
+          name: test_ios_detox
+          run_detox_tests: true
+          requires:
+            - setup_ios
+      - test_ios:
+          name: test_ios_detox_frameworks
+          use_frameworks: true
+          run_detox_tests: true
+          requires:
+             - setup_ios
       - test_js:
           name: test_js_prev_lts
           executor: nodeprevlts

diff --git a/packages/rn-tester/Podfile b/packages/rn-tester/Podfile
@@ -62,4 +62,7 @@ end
 
 post_install do |installer|
   flipper_post_install(installer)
+  installer.pods_project.build_configurations.each do |config|
+    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+  end
 end
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
@@ -488,46 +488,46 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: fe973c09b2299b5e8154186ecf1f6554b4f70987
-  FBReactNativeSpec: 77f376d6af8c6348f0cc6de9a96c7a288f4e03ab
+  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+  FBLazyVector: dae95336e50b91a58de2c7872c06a2fb2dadd7d3
+  FBReactNativeSpec: b87c3b0d86a181222cdaf074915d32d28e8d8e03
   Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
   FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
   OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
-  RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33
-  RCTRequired: d3d4ce60e1e2282864d7560340690a3c8c646de1
-  RCTTypeSafety: 4da4f9f218727257c50fd3bf2683a06cdb4fede3
-  React: 87b3271d925336a94620915db5845c67c5dbbd77
-  React-callinvoker: e9524d75cf0b7ae108868f8d34c0b8d7dc08ec03
-  React-Core: 40874579985cf440232e3f33ce172be1f04d4964
-  React-CoreModules: 87f011fa87190ffe979e443ce578ec93ec6ff4d4
-  React-cxxreact: de6de17eac6bbaa4f9fad46b66e7f0c4aaaf863d
-  React-jsi: 790da16b69a61adc36829eed43c44187c1488d10
-  React-jsiexecutor: 17a3e26806bc19d8be7b6c83792bffc46df796be
-  React-jsinspector: 01db8cd098c7ab72bd09abdda522a08c9acd3af9
-  React-perflogger: 37913fce32026582ad0244b585d1e52652fd01c0
-  React-RCTActionSheet: e6562ea4df7099af4023d1bd0e9716e43b45a5c9
-  React-RCTAnimation: fc2f655a64f0791879ab03843cca90c53737d1cb
-  React-RCTBlob: 5f82467e5d3bef65d05cdd900df6e12b0849744a
-  React-RCTImage: f3a98834281555ce1bbbe1af0306aaf40ac70fc7
-  React-RCTLinking: 801d05ad5e6d1636e977f4dfeab21f87358a02a5
-  React-RCTNetwork: b5e2f27a098ca52d98426328640314a499da6d00
-  React-RCTPushNotification: ce60993f816f917a6495227e16978b5fd550d73b
-  React-RCTSettings: 3cb638230af06ba769edc0bc4ed4123040b1b4e2
-  React-RCTTest: 090e9816044220c39462be109dab6d473d94b1c9
-  React-RCTText: 51a41bf9d18a91b2437b833ed4246754baf830d0
-  React-RCTVibration: a1cce36dd452eb88296d99d80d66f2c5bd50aad4
-  React-runtimeexecutor: 53867815d0a01e53a2c901cb7f01076216c5c799
-  ReactCommon: d101410fc55088c91dc24595715c7b26ec760adf
-  Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631
+  RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
+  RCTRequired: d88f46b6f3e56a16b88e10cfbd08e81c17a674ae
+  RCTTypeSafety: 21d2faada157e10fa5ccfd7ef98f0570500fcab6
+  React: f144678b3b060c226c3b6917d7478190361e6f2f
+  React-callinvoker: fb1453755dd33c2e3922665d420a024ddfca2437
+  React-Core: 0a1edb08e2f8e818cf7c4ea7cf45ee795f581e2f
+  React-CoreModules: 4fd9a479ff48d788bc975a1b2d3b0011205c6033
+  React-cxxreact: 9b2fa7dffb9b14fa16f007cf4cbc06a0b5526c04
+  React-jsi: 0f13422d2099bda9ea7fd3f985b5125721f8d315
+  React-jsiexecutor: 8afd4ee61b34cab4fa7137c4a65ef505e72191ea
+  React-jsinspector: 2f8e73fce7ca4c7847b5decd19f035af5d142862
+  React-perflogger: 81c07a166f30c2b18f7c2dede470766456f8d5e5
+  React-RCTActionSheet: dd58496c7be59a58ee84a9aa9a87a05f82225e68
+  React-RCTAnimation: 9b9188d646b46772c339e35fdaa2b1c305dbdad9
+  React-RCTBlob: ef700613d3a395c13b9210d76aee0d3c5afacd09
+  React-RCTImage: 23159f597b49319b1692a3cf51ee2765b613badc
+  React-RCTLinking: 7473754ddec9d2f7a3d4fa795a5a992f09b9fbab
+  React-RCTNetwork: c92e42182ebe110a58845e54f764b680b01eaa46
+  React-RCTPushNotification: e133baf98472f93cce6f7293b1fd2962ab89c1cb
+  React-RCTSettings: a5fdf9f57e086f5c6c810a83e0a0daf666abd87c
+  React-RCTTest: 2744768f6b4d5d7c405f7d8e05e5db6773adb51c
+  React-RCTText: 031a2c2b93409a9bdf5e8ac78bd824b12b7f5ea5
+  React-RCTVibration: ff1c1fca421ef368af0cbd1dff87f6dcfe11dda3
+  React-runtimeexecutor: 8bb6888366038f8201f7e0b6f98ef1307519075e
+  ReactCommon: 76f1b85c5fff6d7a955e807e19f7673d9b26c521
+  Yoga: 8f8a24d322c96935a6e6acafa528cda3b2d1f950
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 3adfe268d800503789170d1862bde422ee204fe8
+PODFILE CHECKSUM: f9b46e509dcccb417783745234203d691cb13f49
 
 COCOAPODS: 1.10.0
diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -795,6 +795,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				DEVELOPMENT_TEAM = "";
 				EXCLUDED_ARCHS = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -861,6 +862,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -944,6 +946,7 @@
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;

diff --git a/packages/rn-tester/e2e/e2e-helpers.js b/packages/rn-tester/e2e/e2e-helpers.js
@@ -14,7 +14,7 @@
 // by filtering by component and then tapping on the label
 exports.openComponentWithLabel = async (component, label) => {
   await element(by.id('explorer_search')).replaceText(component);
-  await element(by.label(label)).tap();
+  await element(by.label(label)).atIndex(0).tap();
 };
 
 // Will open an individual example for a component

diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
@@ -15,6 +15,7 @@ import {
   StyleSheet,
   useColorScheme,
   View,
+  Text,
   LogBox,
 } from 'react-native';
 import * as React from 'react';
@@ -45,11 +46,9 @@ const APP_STATE_KEY = 'RNTesterAppState.v3';
 // TODO: Vendor AsyncStorage or create our own.
 LogBox.ignoreLogs([/AsyncStorage has been extracted from react-native/]);
 
-const DisplayIfVisible = ({isVisible, children}) => (
-  <View style={[styles.container, !isVisible && styles.hidden]}>
-    {children}
-  </View>
-);
+// Disable yellowbox so that they don't cover the API's tab and make it
+// unaccessible for detox.
+console.disableYellowBox = true;
 
 type ExampleListsContainerProps = $ReadOnly<{|
   theme: RNTesterTheme,
@@ -72,35 +71,38 @@ const ExampleListsContainer = ({
 }: ExampleListsContainerProps) => {
   const isBookmarkEmpty = examplesList.bookmarks.length === 0;
 
+  if(!isVisible){
+    return null;
+  }
+
   return (
-    <DisplayIfVisible isVisible={isVisible}>
-      <Header title={title} theme={theme} />
-      <DisplayIfVisible isVisible={screen === Screens.COMPONENTS}>
-        <RNTesterExampleList
-          sections={examplesList.components}
-          toggleBookmark={toggleBookmark}
-          handleExampleCardPress={handleExampleCardPress}
-        />
-      </DisplayIfVisible>
-      <DisplayIfVisible isVisible={screen === Screens.APIS}>
-        <RNTesterExampleList
-          sections={examplesList.apis}
-          toggleBookmark={toggleBookmark}
-          handleExampleCardPress={handleExampleCardPress}
-        />
-      </DisplayIfVisible>
-      <DisplayIfVisible isVisible={screen === Screens.BOOKMARKS}>
-        {isBookmarkEmpty ? (
-          <RNTesterEmptyBookmarksState />
-        ) : (
+    <>
+        <Header title={title} theme={theme} />
+        {screen === Screens.COMPONENTS && (
+          <RNTesterExampleList
+            sections={examplesList.components}
+            toggleBookmark={toggleBookmark}
+            handleExampleCardPress={handleExampleCardPress}
+          />
+        )}
+        {screen === Screens.APIS && (
+          <RNTesterExampleList
+            sections={examplesList.apis}
+            toggleBookmark={toggleBookmark}
+            handleExampleCardPress={handleExampleCardPress}
+          />
+        )}
+        {screen === Screens.BOOKMARKS && isBookmarkEmpty && (
+              <RNTesterEmptyBookmarksState />
+        )}
+        {screen === Screens.BOOKMARKS && !isBookmarkEmpty && (
           <RNTesterExampleList
             sections={examplesList.bookmarks}
             toggleBookmark={toggleBookmark}
             handleExampleCardPress={handleExampleCardPress}
           />
         )}
-      </DisplayIfVisible>
-    </DisplayIfVisible>
+    </>
   );
 };
 

diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "connect": "^3.6.5",
-    "detox": "16.7.2",
+    "detox": "17.10.0",
     "ws": "^6.1.4"
   }
 }