Skip to content

Commit db71f1b

Browse files
bangarangbangarang
committed
feat: update timeouts and flow
1 parent 688ba16 commit db71f1b

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

‎.github/workflows/test.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ jobs:
8080
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
8181
restore-keys: |
8282
${{ runner.os }}-node-
83-
compression-level: 3
84-
enableCrossOsArchive: true
8583
8684
- name: Install dependencies
8785
if: steps.npm-cache.outputs.cache-hit != 'true'
@@ -99,8 +97,6 @@ jobs:
9997
key: ${{ runner.os }}-build-${{ github.sha }}
10098
restore-keys: |
10199
${{ runner.os }}-build-
102-
compression-level: 3
103-
enableCrossOsArchive: true
104100
105101
unit-tests:
106102
needs: [determine-packages, setup]
@@ -129,8 +125,6 @@ jobs:
129125
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
130126
restore-keys: |
131127
${{ runner.os }}-node-
132-
compression-level: 3
133-
enableCrossOsArchive: true
134128
135129
- name: Restore build artifacts
136130
uses: actions/cache@v3
@@ -141,16 +135,14 @@ jobs:
141135
key: ${{ runner.os }}-build-${{ github.sha }}
142136
restore-keys: |
143137
${{ runner.os }}-build-
144-
compression-level: 3
145-
enableCrossOsArchive: true
146138
147139
- name: Run unit tests
148140
run: npm run test:unit -- --filter=${{ matrix.package }}
149141
env:
150142
TURBO_CACHE_ENABLED: "true"
151143

152144
e2e-tests:
153-
needs: [determine-packages, setup]
145+
needs: [determine-packages, setup, unit-tests]
154146
name: E2E Tests
155147
runs-on: ubuntu-latest
156148
if: ${{ github.head_ref != 'changeset-release/main' }}
@@ -168,10 +160,6 @@ jobs:
168160
with:
169161
path: '**/node_modules'
170162
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
171-
restore-keys: |
172-
${{ runner.os }}-node-
173-
compression-level: 3
174-
enableCrossOsArchive: true
175163

176164
- name: Restore build artifacts
177165
uses: actions/cache@v3
@@ -180,12 +168,8 @@ jobs:
180168
./**/dist
181169
./**/build
182170
key: ${{ runner.os }}-build-${{ github.sha }}
183-
restore-keys: |
184-
${{ runner.os }}-build-
185-
compression-level: 3
186-
enableCrossOsArchive: true
187171

188-
- name: Run E2E tests
172+
- name: Run E2E tests sequentially
189173
run: |
190174
E2E_PACKAGES='${{ needs.determine-packages.outputs.e2e_test_packages }}'
191175
if [ "$E2E_PACKAGES" != "[]" ] && [ "$E2E_PACKAGES" != "" ]; then

‎jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ module.exports = {
33
testEnvironment: 'node',
44
testMatch: ['**/*.e2e.spec.ts'],
55
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
6-
testTimeout: 30000, // Increase timeout to 30 seconds
6+
testTimeout: 1_200_000, // Increase timeout to 20 minutes (1200000 ms)
77
};

‎plugins/record-hook/src/RecordHook.e2e.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ describe('RecordHook e2e', () => {
163163
let records = await getRecords(sheetId)
164164
expect(records[0].values['firstName'].value).toBeUndefined()
165165
expect(records[0].values['lastName'].value).toBeUndefined()
166-
expect(records[0].values['lastName'].messages.length).toBe(0)
166+
expect(records[0].values['lastName'].messages?.length).toBe(0)
167167

168168
// Update the record with a first name, recordHook will add an error to lastName
169169
await api.records.update(sheetId, [
@@ -174,7 +174,7 @@ describe('RecordHook e2e', () => {
174174
records = await getRecords(sheetId)
175175
expect(records[0].values['firstName'].value).toBeDefined()
176176
expect(records[0].values['lastName'].value).toBeUndefined()
177-
expect(records[0].values['lastName'].messages.length).toBe(1)
177+
expect(records[0].values['lastName'].messages?.length).toBe(1)
178178

179179
// Update the record with a last name, recordHook will remove the error from lastName
180180
await api.records.update(sheetId, [
@@ -185,7 +185,7 @@ describe('RecordHook e2e', () => {
185185
records = await getRecords(sheetId)
186186
expect(records[0].values['firstName'].value).toBeUndefined()
187187
expect(records[0].values['lastName'].value).toBeUndefined()
188-
expect(records[0].values['lastName'].messages.length).toBe(0)
188+
expect(records[0].values['lastName'].messages?.length).toBe(0)
189189
})
190190

191191
it('noop', async () => {
@@ -310,7 +310,7 @@ describe('RecordHook e2e', () => {
310310
await createRecords(sheetId, [{ email: '[email protected]' }])
311311
await listener.waitFor('commit:created')
312312
// Sleep for 500ms to allow time for the bulk record hook to be applied
313-
await new Promise(resolve => setTimeout(resolve, 500));
313+
await new Promise((resolve) => setTimeout(resolve, 500))
314314

315315
const records = await getRecords(sheetId)
316316

@@ -340,7 +340,7 @@ describe('RecordHook e2e', () => {
340340
let records = await getRecords(sheetId)
341341
expect(records[0].values['firstName'].value).toBeUndefined()
342342
expect(records[0].values['lastName'].value).toBeUndefined()
343-
expect(records[0].values['lastName'].messages.length).toBe(0)
343+
expect(records[0].values['lastName'].messages?.length).toBe(0)
344344

345345
// Update the record with a first name, recordHook will add an error to lastName
346346
await api.records.update(sheetId, [
@@ -351,7 +351,7 @@ describe('RecordHook e2e', () => {
351351
records = await getRecords(sheetId)
352352
expect(records[0].values['firstName'].value).toBeDefined()
353353
expect(records[0].values['lastName'].value).toBeUndefined()
354-
expect(records[0].values['lastName'].messages.length).toBe(1)
354+
expect(records[0].values['lastName'].messages?.length).toBe(1)
355355

356356
// Update the record with a last name, recordHook will remove the error from lastName
357357
await api.records.update(sheetId, [
@@ -362,7 +362,7 @@ describe('RecordHook e2e', () => {
362362
records = await getRecords(sheetId)
363363
expect(records[0].values['firstName'].value).toBeUndefined()
364364
expect(records[0].values['lastName'].value).toBeUndefined()
365-
expect(records[0].values['lastName'].messages.length).toBe(0)
365+
expect(records[0].values['lastName'].messages?.length).toBe(0)
366366
})
367367

368368
it('noop', async () => {
@@ -441,8 +441,8 @@ describe('RecordHook e2e', () => {
441441
await listener.waitFor('commit:created')
442442
const records = await getRecords(sheetId)
443443

444-
expect(records[0].config.fields.name.readonly).toEqual(true)
445-
expect(records[0].config.fields.age.readonly).toEqual(true)
444+
expect(records[0].config?.fields?.['name'].readonly).toEqual(true)
445+
expect(records[0].config?.fields?.['age'].readonly).toEqual(true)
446446
}, 15_000)
447447
})
448448
})

0 commit comments

Comments
 (0)