Skip to content

Commit d5bf8bf

Browse files
authored
Refactor detox directory into platforms (#370)
1 parent 98267bb commit d5bf8bf

File tree

461 files changed

+2388
-1690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+2388
-1690
lines changed

.circleci/config.yml

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ version: 2.1
22

33
aliases:
44
- &xcode-version 12.5.1
5+
- &node-version '16.12'
56
- &save-cache-yarn
67
save_cache:
78
key: yarn-packages-{{ .Environment.CACHE_VERSION }}-{{ checksum "yarn.lock" }}
@@ -51,6 +52,9 @@ aliases:
5152
attach_workspace:
5253
at: ~/react-native-url-polyfill
5354

55+
orbs:
56+
node: circleci/[email protected]
57+
5458
executors:
5559
default:
5660
docker:
@@ -99,22 +103,13 @@ commands:
99103
command: |
100104
detox clean-framework-cache && detox build-framework-cache
101105
- *save-cache-detox-env
102-
test-hermes-ios:
106+
install-node:
103107
steps:
104-
- *attach-workspace
105-
- *restore-cache-detox-app
106-
- run:
107-
name: Enable Hermes
108-
command: npx shx sed -i "s/:hermes_enabled\s=>\sfalse/:hermes_enabled => true/g" ios/Podfile
109-
- install-yarn-dependencies
110-
- install-detox
111-
- run:
112-
name: Install Pods
113-
command: |
114-
cd ios && pod install
115-
- run:
116-
name: Run Detox on iOS
117-
command: yarn e2e:ios
108+
- node/install:
109+
node-version: *node-version
110+
install-npm: false
111+
install-yarn: true
112+
yarn-version: 1.22.5
118113

119114
jobs:
120115
checkout:
@@ -166,10 +161,11 @@ jobs:
166161
react-native-version:
167162
type: string
168163
executor: << parameters.executor >>
169-
working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
164+
working_directory: ~/react-native-url-polyfill/platforms/react-native/<< parameters.react-native-version >>
170165
steps:
171166
- *attach-workspace
172167
- *restore-cache-detox-app
168+
- install-node
173169
- install-yarn-dependencies
174170
- install-detox
175171
- run:
@@ -187,13 +183,14 @@ jobs:
187183
react-native-version:
188184
type: string
189185
executor: android
190-
working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
186+
working_directory: ~/react-native-url-polyfill/platforms/react-native/<< parameters.react-native-version >>
191187
steps:
192188
- *attach-workspace
193189
- run:
194190
name: Enable Hermes
195191
command: sed -i "s/enableHermes:\sfalse/enableHermes:\ true/g" android/app/build.gradle
196192
- *restore-android-build-cache
193+
- install-node
197194
- install-yarn-dependencies
198195
- run:
199196
name: Build APK
@@ -207,9 +204,23 @@ jobs:
207204
react-native-version:
208205
type: string
209206
executor: << parameters.executor >>
210-
working_directory: ~/react-native-url-polyfill/detox/rn-<< parameters.react-native-version >>
207+
working_directory: ~/react-native-url-polyfill/platforms/react-native/<< parameters.react-native-version >>
211208
steps:
212-
- test-hermes-ios
209+
- *attach-workspace
210+
- *restore-cache-detox-app
211+
- run:
212+
name: Enable Hermes
213+
command: npx shx sed -i "s/:hermes_enabled\s=>\sfalse/:hermes_enabled => true/g" ios/Podfile
214+
- install-node
215+
- install-yarn-dependencies
216+
- install-detox
217+
- run:
218+
name: Install Pods
219+
command: |
220+
cd ios && pod install
221+
- run:
222+
name: Run Detox on iOS
223+
command: yarn e2e:ios
213224

214225
workflows:
215226
tests:

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
/detox/
1+
/platforms/
22
index.d.ts

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
detox
1+
platforms
22
*.tgz
33
.DS_Store

detox/rn-0.66/.detoxrc.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

detox/rn-0.66/e2e/config.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

detox/rn-0.66/e2e/environment.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

detox/rn-0.66/e2e/urlPolyfill.e2e.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

detox/rn-0.66/ios/Detox/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@
3434
"devDependencies": {
3535
"@react-native-community/eslint-config": "3.0.1",
3636
"chalk": "^4.0.0",
37+
"detox": "^18.23.1",
3738
"eslint": "7.32.0",
3839
"eslint-plugin-prettier": "4.0.0",
3940
"execa": "^5.0.0",
4041
"filesize": "^8.0.0",
4142
"husky": "^7.0.0",
42-
"jest": "^27.2.4",
43+
"jest": "^27.3.1",
4344
"lint-staged": ">=8",
4445
"metro-react-native-babel-preset": "^0.66.2",
4546
"ora": "^5.4.1",
@@ -60,7 +61,7 @@
6061
"preset": "react-native",
6162
"testPathIgnorePatterns": [
6263
"/node_modules/",
63-
"./detox/"
64+
"./platforms/"
6465
]
6566
},
6667
"lint-staged": {

detox/rn-0.65/.detoxrc.json renamed to platforms/detox/.detoxrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"testRunner": "jest",
3-
"runnerConfig": "e2e/config.json",
3+
"runnerConfig": "../../detox/config.json",
44
"configurations": {
55
"ios.sim.release": {
66
"type": "ios.simulator",

0 commit comments

Comments
 (0)