Merge branch 'devel' into release-3.4.1

# Conflicts:
#	tools/tests/modern.js
This commit is contained in:
Nacho Codoñer
2026-04-27 17:12:49 +02:00
3 changed files with 38 additions and 26 deletions

View File

@@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v3
- name: Manage inactive issues
uses: actions/github-script@v8
uses: actions/github-script@v9
with:
script: |
const script = require('./.github/scripts/inactive-issues.js')

View File

@@ -137,7 +137,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-isolated-tests
path: ./tmp/results
@@ -203,7 +203,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-0
path: ./tmp/results
@@ -268,7 +268,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-1
path: ./tmp/results
@@ -341,7 +341,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-2
path: ./tmp/results
@@ -406,7 +406,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-3
path: ./tmp/results
@@ -471,7 +471,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-4
path: ./tmp/results
@@ -537,7 +537,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-5
path: ./tmp/results
@@ -602,7 +602,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-6
path: ./tmp/results
@@ -667,7 +667,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-7
path: ./tmp/results
@@ -732,7 +732,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-8
path: ./tmp/results
@@ -797,7 +797,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-9
path: ./tmp/results
@@ -862,7 +862,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-10
path: ./tmp/results
@@ -927,7 +927,7 @@ jobs:
- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: junit-group-11
path: ./tmp/results

View File

@@ -4545,17 +4545,24 @@ Meteor.isServer && testAsyncMulti(
{ resolverType: 'stub' }
);
let insertId;
await Collection.find({}).observeChangesAsync({
let observerInsertId;
let resolveObserver;
const observerFired = new Promise((resolve) => { resolveObserver = resolve; });
const handle = await Collection.find({}).observeChangesAsync({
async added(_id, fields) {
insertId = _id;
observerInsertId = _id;
resolveObserver();
throw new Error('Test error in async added observeChangesAsync');
},
});
return Collection.insertAsync({ foo: { bar: 123 } }).finally((id, bad) => {
test.equal(insertId, id);
})
// insertAsync resolves normally — observer errors are caught and logged,
// not propagated back to the caller (see observe_multiplex `_applyCallback`).
const id = await Collection.insertAsync({ foo: { bar: 123 } });
await observerFired;
test.equal(observerInsertId, id);
await handle.stop();
},
async (test) => {
@@ -4564,17 +4571,22 @@ Meteor.isServer && testAsyncMulti(
{ resolverType: 'stub' }
);
let insertId;
await Collection.find({}).observeChangesAsync({
let observerInsertId;
let resolveObserver;
const observerFired = new Promise((resolve) => { resolveObserver = resolve; });
const handle = await Collection.find({}).observeChangesAsync({
added(id) {
insertId = _id;
observerInsertId = id;
resolveObserver();
throw new Error('Test error in sync added observeChangesAsync');
},
});
return Collection.insertAsync({ foo: { bar: 123 } }).finally((id, bad) => {
test.equal(insertId, id);
})
const id = await Collection.insertAsync({ foo: { bar: 123 } });
await observerFired;
test.equal(observerInsertId, id);
await handle.stop();
}
]
);