Skip to content

Commit 31feddc

Browse files
committed
Merge remote-tracking branch 'origin/v4.2' into v5.0
# Conflicts: # .github/workflows/RavenClient.yml # package-lock.json # package.json # src/Documents/BulkInsertOperation.ts # src/Documents/Commands/CreateSubscriptionCommand.ts # src/Documents/Commands/GetNextOperationIdCommand.ts # src/Documents/Commands/MultiGet/MultiGetCommand.ts # src/Documents/DocumentStoreBase.ts # src/Documents/Identity/HiloMultiDatabaseIdGenerator.ts # src/Documents/Indexes/AbstractIndexCreationTaskBase.ts # src/Documents/Session/AbstractDocumentQuery.ts # src/Documents/Session/IDocumentQuery.ts # src/Documents/Session/Operations/QueryOperation.ts # src/Documents/Subscriptions/DocumentSubscriptions.ts # src/ServerWide/Operations/Certificates/EditClientCertificateOperation.ts # src/ServerWide/Operations/Certificates/GetCertificateMetadataOperation.ts # src/ServerWide/Operations/Certificates/GetCertificatesMetadataOperation.ts # test/Ported/Graph/ClientGraphQueriesTest.ts # test/Ported/Issues/RavenDB_12030.ts # test/Ported/Issues/RavenDB_15825.ts # test/TestDriver/index.ts # test/Utils/TestUtil.ts
2 parents f615f00 + bb88bcf commit 31feddc

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

test/Issues/RavenDB_11703.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import { timeout, delay } from "../../src/Utility/PromiseUtil";
1111

1212
describe("RavenDB-11703", function () {
1313

14+
this.retries(3);
15+
1416
let store: IDocumentStore;
1517

1618
beforeEach(async function () {
@@ -133,6 +135,7 @@ describe("RavenDB-11703", function () {
133135
}
134136

135137
it("canSubscribeToCounterChanges", async function () {
138+
136139
const changes = store.changes();
137140
await changes.ensureConnectedNow();
138141

test/Ported/Counters/SessionCountersTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe("SessionCountersTest", function () {
7272
await session.saveChanges();
7373
}
7474

75-
let { counters } = (await store.operations
75+
const { counters } = (await store.operations
7676
.send(new GetCountersOperation("users/1-A", ["likes", "downloads"])));
7777
assert.strictEqual(counters.length, 2);
7878

test/Ported/Subscriptions/SecuredSubscriptionsBasicTest.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import {
88
import { AsyncQueue } from "../../Utils/AsyncQueue";
99

1010
describe("SecuredSubscriptionsBasicTest", function () {
11+
12+
this.retries(3);
13+
1114
const _reasonableWaitTime = 5 * 1000;
1215
this.timeout(5 * _reasonableWaitTime);
1316

0 commit comments

Comments
 (0)