Quellcode durchsuchen

migrating to detox5

Daniel Zlotin vor 7 Jahren
Ursprung
Commit
39fe1292d2
3 geänderte Dateien mit 44 neuen und 36 gelöschten Zeilen
  1. 2
    2
      package.json
  2. 26
    26
      playground/ios/playground.xcodeproj/project.pbxproj
  3. 16
    8
      yarn.lock

+ 2
- 2
package.json Datei anzeigen

@@ -58,8 +58,8 @@
58 58
     "jest-cli": "18.x.x",
59 59
     "remx": "0.1.x",
60 60
     "semver": "5.x.x",
61
-    "detox": "4.x.x",
62
-    "detox-server": "1.x.x",
61
+    "detox": "5.x.x",
62
+    "mocha": "*",
63 63
     "shell-utils": "1.x.x"
64 64
   },
65 65
   "babel": {

+ 26
- 26
playground/ios/playground.xcodeproj/project.pbxproj Datei anzeigen

@@ -7,26 +7,26 @@
7 7
 	objects = {
8 8
 
9 9
 /* Begin PBXBuildFile section */
10
-		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11
-		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12
-		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13
-		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14
-		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
15
-		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
16
-		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
17
-		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
10
+		00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
11
+		00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
12
+		00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
13
+		00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
14
+		00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
15
+		133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
16
+		139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
17
+		139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
18 18
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
19 19
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
20 20
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
21 21
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
22
-		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
22
+		146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
23 23
 		26070FD01E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 26070FCF1E4B8B9D003EC8B9 /* RNNControllerFactoryTest.m */; };
24 24
 		261F0E671E6EE9EC00989DE2 /* RNNModalManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 261F0E661E6EE9EC00989DE2 /* RNNModalManagerTest.m */; };
25
-		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25
+		2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
26 26
 		268692851E50572700E2C612 /* RNNStoreTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 268692841E50572700E2C612 /* RNNStoreTest.m */; };
27
-		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
28
-		7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
29
-		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
27
+		7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
28
+		7BD721FF1E2E421E00724059 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
29
+		832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
30 30
 /* End PBXBuildFile section */
31 31
 
32 32
 /* Begin PBXContainerItemProxy section */
@@ -267,7 +267,7 @@
267 267
 			isa = PBXFrameworksBuildPhase;
268 268
 			buildActionMask = 2147483647;
269 269
 			files = (
270
-				7BD721FF1E2E421E00724059 /* libReactNativeNavigation.a in Frameworks */,
270
+				7BD721FF1E2E421E00724059 /* ReferenceProxy in Frameworks */,
271 271
 			);
272 272
 			runOnlyForDeploymentPostprocessing = 0;
273 273
 		};
@@ -275,18 +275,18 @@
275 275
 			isa = PBXFrameworksBuildPhase;
276 276
 			buildActionMask = 2147483647;
277 277
 			files = (
278
-				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
279
-				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
280
-				146834051AC3E58100842450 /* libReact.a in Frameworks */,
281
-				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
282
-				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
283
-				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
284
-				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
285
-				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
286
-				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
287
-				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
288
-				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
289
-				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
278
+				7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */,
279
+				2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */,
280
+				146834051AC3E58100842450 /* ReferenceProxy in Frameworks */,
281
+				00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
282
+				00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
283
+				00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
284
+				133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */,
285
+				00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
286
+				139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */,
287
+				832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */,
288
+				00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
289
+				139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */,
290 290
 			);
291 291
 			runOnlyForDeploymentPostprocessing = 0;
292 292
 		};

+ 16
- 8
yarn.lock Datei anzeigen

@@ -1399,21 +1399,23 @@ detect-indent@^4.0.0:
1399 1399
   dependencies:
1400 1400
     repeating "^2.0.0"
1401 1401
 
1402
-detox-server@1.x.x:
1403
-  version "1.1.0"
1404
-  resolved "https://registry.yarnpkg.com/detox-server/-/detox-server-1.1.0.tgz#4d3c9a2a54fa2ed963d6c3a12dfb417226dc38ca"
1402
+detox-server@^1.2.1:
1403
+  version "1.2.1"
1404
+  resolved "https://registry.yarnpkg.com/detox-server/-/detox-server-1.2.1.tgz#42caf4434fab93f3cca7242d066f08175c8f1ef8"
1405 1405
   dependencies:
1406 1406
     lodash "^4.13.1"
1407
+    npmlog "^4.0.2"
1407 1408
     ws "^1.1.0"
1408 1409
 
1409
-detox@4.x.x:
1410
-  version "4.3.1"
1411
-  resolved "https://registry.yarnpkg.com/detox/-/detox-4.3.1.tgz#430a3ab6c468a8e52dc8d196fa71204541fc5896"
1410
+detox@5.x.x:
1411
+  version "5.0.4"
1412
+  resolved "https://registry.yarnpkg.com/detox/-/detox-5.0.4.tgz#aff96e21aa4b9718994912b6beaa3011cf2bdab5"
1412 1413
   dependencies:
1413 1414
     child-process-promise "^2.2.0"
1414 1415
     commander "^2.9.0"
1416
+    detox-server "^1.2.1"
1417
+    get-port "^2.1.0"
1415 1418
     lodash "^4.14.1"
1416
-    mocha "^3.2.0"
1417 1419
     npmlog "^4.0.2"
1418 1420
     react-native-invoke "^0.2.1"
1419 1421
     ws "^1.1.1"
@@ -2000,6 +2002,12 @@ get-caller-file@^1.0.1:
2000 2002
   version "1.0.2"
2001 2003
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
2002 2004
 
2005
+get-port@^2.1.0:
2006
+  version "2.1.0"
2007
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
2008
+  dependencies:
2009
+    pinkie-promise "^2.0.0"
2010
+
2003 2011
 getpass@^0.1.1:
2004 2012
   version "0.1.6"
2005 2013
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
@@ -3186,7 +3194,7 @@ mobx@2.x.x:
3186 3194
   version "2.7.0"
3187 3195
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.7.0.tgz#cf3d82d18c0ca7f458d8f2a240817b3dc7e54a01"
3188 3196
 
3189
-mocha@^3.2.0:
3197
+mocha@*:
3190 3198
   version "3.2.0"
3191 3199
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
3192 3200
   dependencies: