Skip to content

Commit c6da61f

Browse files
authored
E2E split into parallel and serial flows (#6317)
* e2e split into parallel and serial flows * revert config changes * downgrade to 3 runners * bump watchdog action to v4 * some minor optimizations * add required yarn install again * set max workers back to 2 * chmod -x new serial script
1 parent 044daae commit c6da61f

13 files changed

+38
-22
lines changed

.github/workflows/comments-watchdog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fi
6666
6767
- name: Upload deleted comments log as artifact
68-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
6969
with:
7070
name: deleted-comments-log
7171
path: deleted_comments_log.txt

.github/workflows/macstadium-tests.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
- name: Set up github keys
1818
run: git config core.sshCommand "ssh -i ~/.ssh/id_ed25519 -F /dev/null"
1919

20-
- name: Clean iOS app
21-
run: yarn cache clean && yarn clean:ios > /dev/null 2>&1 || true
22-
2320
- name: Set up ENV vars & scripts
2421
env:
2522
CI_SCRIPTS: ${{ secrets.CI_SCRIPTS }}
@@ -168,6 +165,10 @@ jobs:
168165
sed -i'' -e "s/IS_TESTING=false/IS_TESTING=true/" .env && rm -f .env-e
169166
yarn detox build --configuration ios.sim.release
170167
171-
- name: Detox iOS e2e tests
168+
- name: Detox iOS e2e tests parallel
169+
run: |
170+
./scripts/run-parallel-e2e.sh 3
171+
172+
- name: Detox iOS e2e tests serial
172173
run: |
173-
./scripts/run-retry-tests.sh 3
174+
./scripts/run-serial-e2e.sh 3

e2e/1_importAndWatchWalletsFlow.spec.ts renamed to e2e/parallel/1_importAndWatchWalletsFlow.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
authenticatePin,
1010
delayTime,
1111
afterAllcleanApp,
12-
} from './helpers';
13-
import { WALLET_VARS } from './testVariables';
12+
} from '../helpers';
13+
import { WALLET_VARS } from '../testVariables';
1414

1515
const android = device.getPlatform() === 'android';
1616

e2e/2_newWalletFlow.spec.ts renamed to e2e/parallel/2_newWalletFlow.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { device } from 'detox';
2-
import { beforeAllcleanApp, checkIfVisible, waitAndTap, authenticatePin, delayTime, afterAllcleanApp } from './helpers';
2+
import { beforeAllcleanApp, checkIfVisible, waitAndTap, authenticatePin, delayTime, afterAllcleanApp } from '../helpers';
33

44
const android = device.getPlatform() === 'android';
55

e2e/3_homeScreen.spec.ts renamed to e2e/parallel/3_homeScreen.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
afterAllcleanApp,
99
tap,
1010
delayTime,
11-
} from './helpers';
11+
} from '../helpers';
1212

1313
const RAINBOW_TEST_WALLET = 'rainbowtestwallet.eth';
1414

e2e/4_discoverSheetFlow.spec.ts renamed to e2e/parallel/4_discoverSheetFlow.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
delayTime,
1212
importWalletFlow,
1313
afterAllcleanApp,
14-
} from './helpers';
14+
} from '../helpers';
1515

1616
const ios = device.getPlatform() === 'ios';
1717

e2e/6_watchedWalletCollectionActionsFlow.spec.ts renamed to e2e/parallel/5_watchedWalletCollectionActionsFlow.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
checkIfDoesntExist,
1010
delayTime,
1111
afterAllcleanApp,
12-
} from './helpers';
12+
} from '../helpers';
1313

1414
describe('Watched showcase and hidden actions flow', () => {
1515
beforeAll(async () => {

e2e/7_maliciousDappConnection.spec.ts renamed to e2e/parallel/6_maliciousDappConnection.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
delayTime,
1111
tapAtPoint,
1212
checkIfExists,
13-
} from './helpers';
14-
import { WALLET_VARS } from './testVariables';
13+
} from '../helpers';
14+
import { WALLET_VARS } from '../testVariables';
1515

1616
describe('Check malicious dapp warning', () => {
1717
beforeAll(async () => {

e2e/8_manualBackup.spec.ts renamed to e2e/parallel/7_manualBackup.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import {
66
tap,
77
tapByText,
88
delayTime,
9-
tapAtPoint,
109
checkIfExistsByText,
1110
checkIfExists,
1211
waitAndTap,
1312
checkIfDoesntExist,
14-
} from './helpers';
13+
} from '../helpers';
1514

1615
describe('Backups', () => {
1716
beforeAll(async () => {

e2e/5_sendSheetFlowContacts.spec.ts renamed to e2e/serial/1_sendSheetFlowContacts.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
tapByText,
1313
delayTime,
1414
afterAllcleanApp,
15-
} from './helpers';
15+
} from '../helpers';
1616

1717
const android = device.getPlatform() === 'android';
1818

0 commit comments

Comments
 (0)