Skip to content

Commit c6a5c09

Browse files
committedJun 5, 2019
Update detox to match master
1 parent 52cda84 commit c6a5c09

File tree

2 files changed

+107
-18
lines changed

2 files changed

+107
-18
lines changed
 

‎package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
153153
"test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e",
154154
"build-ios-e2e": "detox build -c ios.sim.release",
155-
"test-ios-e2e": "detox test -c ios.sim.release"
155+
"test-ios-e2e": "detox test -c ios.sim.release RNTester/e2e"
156156
},
157157
"peerDependencies": {
158158
"react": "16.8.3"
@@ -216,7 +216,7 @@
216216
"async": "^2.4.0",
217217
"babel-eslint": "9.0.0",
218218
"coveralls": "^3.0.2",
219-
"detox": "9.0.4",
219+
"detox": "12.2.0",
220220
"eslint": "5.1.0",
221221
"eslint-config-fb-strict": "22.1.0",
222222
"eslint-config-fbjs": "2.0.1",
@@ -240,19 +240,19 @@
240240
"detox": {
241241
"test-runner": "jest",
242242
"runner-config": "RNTester/e2e/config.json",
243-
"specs": "RNTester/e2e",
243+
"specs": "",
244244
"configurations": {
245245
"ios.sim.release": {
246246
"binaryPath": "RNTester/build/Build/Products/Release-iphonesimulator/RNTester.app/",
247247
"build": "xcodebuild -project RNTester/RNTester.xcodeproj -scheme RNTester -configuration Release -sdk iphonesimulator -derivedDataPath RNTester/build -UseModernBuildSystem=NO -quiet",
248248
"type": "ios.simulator",
249-
"name": "iPhone 8"
249+
"name": "iPhone 6s"
250250
},
251251
"ios.sim.debug": {
252252
"binaryPath": "RNTester/build/Build/Products/Debug-iphonesimulator/RNTester.app/",
253253
"build": "xcodebuild -project RNTester/RNTester.xcodeproj -scheme RNTester -configuration Debug -sdk iphonesimulator -derivedDataPath RNTester/build -UseModernBuildSystem=NO -quiet",
254254
"type": "ios.simulator",
255-
"name": "iPhone 8"
255+
"name": "iPhone 6s"
256256
}
257257
}
258258
}

‎yarn.lock

+102-13
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,11 @@ ansi-regex@^4.0.0:
15351535
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
15361536
integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
15371537

1538+
ansi-regex@^4.1.0:
1539+
version "4.1.0"
1540+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
1541+
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
1542+
15381543
ansi-styles@^2.2.1:
15391544
version "2.2.1"
15401545
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -2344,6 +2349,15 @@ cliui@^4.0.0:
23442349
strip-ansi "^4.0.0"
23452350
wrap-ansi "^2.0.0"
23462351

2352+
cliui@^5.0.0:
2353+
version "5.0.0"
2354+
resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
2355+
integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
2356+
dependencies:
2357+
string-width "^3.1.0"
2358+
strip-ansi "^5.2.0"
2359+
wrap-ansi "^5.1.0"
2360+
23472361
co@^4.6.0:
23482362
version "4.6.0"
23492363
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -2403,7 +2417,7 @@ combined-stream@~1.0.6:
24032417
dependencies:
24042418
delayed-stream "~1.0.0"
24052419

2406-
commander@^2.15.1, commander@^2.9.0:
2420+
commander@^2.9.0:
24072421
version "2.19.0"
24082422
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
24092423
integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2624,7 +2638,7 @@ debug@^4.1.1:
26242638
dependencies:
26252639
ms "^2.1.1"
26262640

2627-
decamelize@^1.1.1:
2641+
decamelize@^1.1.1, decamelize@^1.2.0:
26282642
version "1.2.0"
26292643
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
26302644
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2742,15 +2756,14 @@ detect-newline@^2.1.0:
27422756
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
27432757
integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
27442758

2745-
detox@9.0.4:
2746-
version "9.0.4"
2747-
resolved "https://registry.yarnpkg.com/detox/-/detox-9.0.4.tgz#ff8deeb56464ca0a351b7f9123c86a52dc80d8ef"
2748-
integrity sha512-2dbMXA2BlJmtx2XWOwMHETsbwKdn9mjto9jrQ2djgmpt3+ulJhWmODmbKCKgtvNuDE5wlfjogvxfoPIv0rzinA==
2759+
detox@12.2.0:
2760+
version "12.2.0"
2761+
resolved "https://registry.yarnpkg.com/detox/-/detox-12.2.0.tgz#73f3a1dd39b740fe37078b50cce19ced9fbf9a8e"
2762+
integrity sha512-6M5jWGxXbop+sOzZD/IhL4TgNKFPS4OJbe5mvNQyDWQL901jUsCHj+6lE/9vTcS/tNnGC/HLXHlDiTuTP38/Tg==
27492763
dependencies:
27502764
bunyan "^1.8.12"
27512765
bunyan-debug-stream "^1.1.0"
27522766
child-process-promise "^2.2.0"
2753-
commander "^2.15.1"
27542767
fs-extra "^4.0.2"
27552768
get-port "^2.1.0"
27562769
ini "^1.3.4"
@@ -2759,10 +2772,12 @@ detox@9.0.4:
27592772
proper-lockfile "^3.0.2"
27602773
sanitize-filename "^1.6.1"
27612774
shell-utils "^1.0.9"
2762-
tail "^1.2.3"
2775+
tail "^2.0.0"
27632776
telnet-client "0.15.3"
27642777
tempfile "^2.0.0"
27652778
ws "^1.1.1"
2779+
yargs "^13.0.0"
2780+
yargs-parser "^13.0.0"
27662781

27672782
diff-sequences@^24.3.0:
27682783
version "24.3.0"
@@ -2818,6 +2833,11 @@ electron-to-chromium@^1.3.92:
28182833
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.95.tgz#79fac438813ca7f3db182a525c2ab432934f6484"
28192834
integrity sha512-0JZEDKOQAE05EO/4rk3vLAE+PYFI9OLCVLAS4QAq1y+Bb2y1N6MyQJz62ynzHN/y0Ka/nO5jVJcahbCEdfiXLQ==
28202835

2836+
emoji-regex@^7.0.1:
2837+
version "7.0.3"
2838+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
2839+
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
2840+
28212841
encodeurl@~1.0.1, encodeurl@~1.0.2:
28222842
version "1.0.2"
28232843
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3598,6 +3618,11 @@ get-caller-file@^1.0.1:
35983618
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
35993619
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
36003620

3621+
get-caller-file@^2.0.1:
3622+
version "2.0.5"
3623+
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
3624+
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
3625+
36013626
get-port@^2.1.0:
36023627
version "2.1.0"
36033628
resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
@@ -6098,6 +6123,15 @@ os-locale@^3.0.0:
60986123
lcid "^2.0.0"
60996124
mem "^4.0.0"
61006125

6126+
os-locale@^3.1.0:
6127+
version "3.1.0"
6128+
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
6129+
integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
6130+
dependencies:
6131+
execa "^1.0.0"
6132+
lcid "^2.0.0"
6133+
mem "^4.0.0"
6134+
61016135
os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
61026136
version "1.0.2"
61036137
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -6833,6 +6867,11 @@ require-main-filename@^1.0.1:
68336867
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
68346868
integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
68356869

6870+
require-main-filename@^2.0.0:
6871+
version "2.0.0"
6872+
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
6873+
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
6874+
68366875
require-uncached@^1.0.3:
68376876
version "1.0.3"
68386877
resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -7379,6 +7418,15 @@ string-width@^1.0.1:
73797418
is-fullwidth-code-point "^2.0.0"
73807419
strip-ansi "^4.0.0"
73817420

7421+
string-width@^3.0.0, string-width@^3.1.0:
7422+
version "3.1.0"
7423+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
7424+
integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
7425+
dependencies:
7426+
emoji-regex "^7.0.1"
7427+
is-fullwidth-code-point "^2.0.0"
7428+
strip-ansi "^5.1.0"
7429+
73827430
string.prototype.matchall@^2.0.0:
73837431
version "2.0.0"
73847432
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
@@ -7418,6 +7466,13 @@ strip-ansi@^5.0.0:
74187466
dependencies:
74197467
ansi-regex "^4.0.0"
74207468

7469+
strip-ansi@^5.1.0, strip-ansi@^5.2.0:
7470+
version "5.2.0"
7471+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
7472+
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
7473+
dependencies:
7474+
ansi-regex "^4.1.0"
7475+
74217476
strip-bom@^2.0.0:
74227477
version "2.0.0"
74237478
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -7481,10 +7536,10 @@ table@^4.0.3:
74817536
slice-ansi "1.0.0"
74827537
string-width "^2.1.1"
74837538

7484-
tail@^1.2.3:
7485-
version "1.4.0"
7486-
resolved "https://registry.yarnpkg.com/tail/-/tail-1.4.0.tgz#884b216220b90804bfe87a4c8174c2efed0e2661"
7487-
integrity sha512-wjwfZw6wcMFTB1Po7NFUf4TdCDwX8duZjdTMhnHBEC677Q6mFRcVZE7f/nZDhG2Fpf/wEEKOJP9L7/b11/vlHQ==
7539+
tail@^2.0.0:
7540+
version "2.0.2"
7541+
resolved "https://registry.yarnpkg.com/tail/-/tail-2.0.2.tgz#86073f3a9a568807b7fd886897a7350314275b5f"
7542+
integrity sha512-raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ==
74887543

74897544
tar@^4:
74907545
version "4.4.6"
@@ -7922,6 +7977,15 @@ wrap-ansi@^2.0.0:
79227977
string-width "^1.0.1"
79237978
strip-ansi "^3.0.1"
79247979

7980+
wrap-ansi@^5.1.0:
7981+
version "5.1.0"
7982+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
7983+
integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
7984+
dependencies:
7985+
ansi-styles "^3.2.0"
7986+
string-width "^3.0.0"
7987+
strip-ansi "^5.0.0"
7988+
79257989
wrappy@1:
79267990
version "1.0.2"
79277991
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -8040,7 +8104,7 @@ y18n@^3.2.1:
80408104
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
80418105
integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
80428106

8043-
"y18n@^3.2.1 || ^4.0.0":
8107+
"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
80448108
version "4.0.0"
80458109
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
80468110
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
@@ -8062,6 +8126,14 @@ yargs-parser@^10.1.0:
80628126
dependencies:
80638127
camelcase "^4.1.0"
80648128

8129+
yargs-parser@^13.0.0, yargs-parser@^13.1.0:
8130+
version "13.1.0"
8131+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f"
8132+
integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==
8133+
dependencies:
8134+
camelcase "^5.0.0"
8135+
decamelize "^1.2.0"
8136+
80658137
yargs-parser@^7.0.0:
80668138
version "7.0.0"
80678139
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -8087,6 +8159,23 @@ yargs@^12.0.2:
80878159
y18n "^3.2.1 || ^4.0.0"
80888160
yargs-parser "^10.1.0"
80898161

8162+
yargs@^13.0.0:
8163+
version "13.2.4"
8164+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
8165+
integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
8166+
dependencies:
8167+
cliui "^5.0.0"
8168+
find-up "^3.0.0"
8169+
get-caller-file "^2.0.1"
8170+
os-locale "^3.1.0"
8171+
require-directory "^2.1.1"
8172+
require-main-filename "^2.0.0"
8173+
set-blocking "^2.0.0"
8174+
string-width "^3.0.0"
8175+
which-module "^2.0.0"
8176+
y18n "^4.0.0"
8177+
yargs-parser "^13.1.0"
8178+
80908179
yargs@^9.0.0:
80918180
version "9.0.1"
80928181
resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"

0 commit comments

Comments
 (0)
Please sign in to comment.