Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1144@patch: Run tests against newer Node.js versions #1145

Merged
merged 7 commits into from
Oct 27, 2023
Merged

#1144@patch: Run tests against newer Node.js versions #1145

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0a4954
#1144@patch: Run tests against newer Node.js versions
IGx89 Oct 26, 2023
676e313
#1144@patch: Add continue-on-error.
IGx89 Oct 26, 2023
a35f7b2
#1144@patch: Fix flaky test.
IGx89 Oct 26, 2023
f26b084
#1144@patch: Fix test on Node 20.
IGx89 Oct 26, 2023
49d489d
#1144@trivial: Updates Date ISO week function to a more battle tested.
capricorn86 Oct 27, 2023
a56ed6a
#1144@trivial: Updates Date ISO week function to a more battle tested.
capricorn86 Oct 27, 2023
61d4274
Merge branch 'master' into task/test-newer-node-versions
capricorn86 Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ on: pull_request
jobs:
build:
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
node-version: [16]
node-version: [16, 18, 20]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions packages/happy-dom/src/nodes/html-input-element/HTMLInputElementDateUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export default class HTMLInputElementDateUtility {
date.setUTCDate(date.getUTCDate() - day + 3);
const firstThursday = date.getTime();
date.setUTCMonth(0, 1);
if (date.getDay() !== 4) {
date.setUTCMonth(0, 1 + ((4 - date.getDay() + 7) % 7));
if (date.getUTCDay() !== 4) {
date.setUTCMonth(0, 1 + ((4 - date.getUTCDay() + 7) % 7));
}
return (
date.getUTCFullYear() +
Expand All @@ -37,7 +37,7 @@ export default class HTMLInputElementDateUtility {
}
const date = new Date(`${Y}-01-01T00:00Z`);
const jan4th = new Date(`${Y}-01-04T00:00Z`);
const jan4thDay = (jan4th.getDay() + 6) % 7;
const jan4thDay = (jan4th.getUTCDay() + 6) % 7;
const ordinalDate = 1 + (Number(W) - 1) * 7 - jan4thDay + 3;
date.setUTCDate(ordinalDate);
if (date.getUTCFullYear() > Number(Y)) {
Expand Down
1 change: 1 addition & 0 deletions packages/happy-dom/test/nodes/html-input-element/HTMLInputElement.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ describe('HTMLInputElement', () => {
{ type: 'time', value: '00:00', want: new Date('1970-01-01T00:00Z') },
{ type: 'time', value: '12:00', want: new Date('1970-01-01T12:00Z') },
{ type: 'time', value: '18:55', want: new Date('1970-01-01T18:55Z') },
{ type: 'week', value: '1981-W01', want: new Date('1980-12-29T00:00Z') },
{ type: 'week', value: '2023-W22', want: new Date('2023-05-29T00:00Z') }
])(`Should return valid date for type $type with valid value`, ({ type, value, want }) => {
element.type = type;
Expand Down
4 changes: 2 additions & 2 deletions packages/happy-dom/test/window/Window.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ describe('Window', () => {
expect((<ErrorEvent>(<unknown>errorEvent)).error?.message).toBe('Test error');
expect((<ErrorEvent>(<unknown>errorEvent)).message).toBe('Test error');
resolve(null);
}, 15);
}, 20);
});
});
});
Expand Down Expand Up @@ -1030,7 +1030,7 @@ describe('Window', () => {
expect((<ErrorEvent>(<unknown>errorEvent)).error?.message).toBe('Test error');
expect((<ErrorEvent>(<unknown>errorEvent)).message).toBe('Test error');
resolve(null);
}, 10);
}, 20);
});
});
});
Expand Down
17 changes: 8 additions & 9 deletions packages/uncaught-exception-observer/test/UncaughtExceptionObserver.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,24 @@ async function itObservesUnhandledJavaScriptFetchRejections(): Promise<void> {
<script src="https://localhost:3000/404.js" async></script>
`);

await new Promise((resolve) => setTimeout(resolve, 10));
for (let i = 0; i < 10; i++) {
await new Promise((resolve) => setTimeout(resolve, 10));
if (errorEvent) {
break;
}
}

observer.disconnect();

if (!(errorEvent instanceof window.ErrorEvent)) {
throw new Error('Error event not dispatched.');
}

if (
errorEvent.error.message !==
'Fetch to "https://localhost:3000/404.js" failed. Error: connect ECONNREFUSED 127.0.0.1:3000'
) {
if (!errorEvent.error.message.startsWith('Fetch to "https://localhost:3000/404.js" failed.')) {
capricorn86 marked this conversation as resolved.
Show resolved Hide resolved
throw new Error('Error message not correct.');
}

if (
errorEvent.message !==
'Fetch to "https://localhost:3000/404.js" failed. Error: connect ECONNREFUSED 127.0.0.1:3000'
) {
if (!errorEvent.message.startsWith('Fetch to "https://localhost:3000/404.js" failed.')) {
throw new Error('Error message not correct.');
}
}
Expand Down