From bd315475be8db4429b08238b9195522614f64323 Mon Sep 17 00:00:00 2001 From: Marcin Lewandowski Date: Sat, 15 Jul 2023 15:24:57 +0200 Subject: [PATCH 1/3] allow to run v5.2 client against v6.0 server --- .github/workflows/RavenClient.yml | 3 ++- test/Ported/Graph/BasicGraphQueriesTest.ts | 4 ++-- test/Ported/Graph/ClientGraphQueriesTest.ts | 6 +++--- test/Utils/TestUtil.ts | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/RavenClient.yml b/.github/workflows/RavenClient.yml index 2b6d2b6ac..a9c569f4c 100644 --- a/.github/workflows/RavenClient.yml +++ b/.github/workflows/RavenClient.yml @@ -12,7 +12,7 @@ on: ravendb_version: description: 'RavenDB Version' required: true - type: string + type: string jobs: build: @@ -27,6 +27,7 @@ jobs: RAVENDB_TEST_HTTPS_SERVER_URL: https://localhost:8989 RAVENDB_BUILD_TYPE: nightly RAVEN_License: ${{ secrets.RAVEN_LICENSE }} + RAVENDB_SERVER_VERSION: ${{ matrix.serverVersion }} strategy: matrix: diff --git a/test/Ported/Graph/BasicGraphQueriesTest.ts b/test/Ported/Graph/BasicGraphQueriesTest.ts index 2bc459e8f..348885dbb 100644 --- a/test/Ported/Graph/BasicGraphQueriesTest.ts +++ b/test/Ported/Graph/BasicGraphQueriesTest.ts @@ -1,11 +1,11 @@ import { IDocumentStore } from "../../../src/Documents/IDocumentStore"; -import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil"; +import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil"; import { DocumentType } from "../../../src/Documents/DocumentAbstractions"; import { CreateSampleDataOperation } from "../../Utils/CreateSampleDataOperation"; import { assertThat } from "../../Utils/AssertExtensions"; import { Movie } from "../../Assets/Graph"; -describe("BasicGraphQueriesTest", function () { +(RavenTestContext.is60Server ? describe.skip : describe)("BasicGraphQueriesTest", function () { let store: IDocumentStore; diff --git a/test/Ported/Graph/ClientGraphQueriesTest.ts b/test/Ported/Graph/ClientGraphQueriesTest.ts index 111af46be..0c8772d3a 100644 --- a/test/Ported/Graph/ClientGraphQueriesTest.ts +++ b/test/Ported/Graph/ClientGraphQueriesTest.ts @@ -1,10 +1,10 @@ import { IDocumentStore } from "../../../src/Documents/IDocumentStore"; -import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil"; +import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil"; import { assertThat } from "../../Utils/AssertExtensions"; import moment = require("moment"); import { DateUtil } from "../../../src/Utility/DateUtil"; -describe("ClientGraphQueriesTest", function () { +(RavenTestContext.is60Server ? describe.skip : describe)("ClientGraphQueriesTest", function () { let store: IDocumentStore; @@ -233,4 +233,4 @@ class FriendDescriptor { this.friendsSince = friendsSince; this.friendId = friendId; } -} \ No newline at end of file +} diff --git a/test/Utils/TestUtil.ts b/test/Utils/TestUtil.ts index a1d8a3065..b7e3a7e03 100644 --- a/test/Utils/TestUtil.ts +++ b/test/Utils/TestUtil.ts @@ -49,7 +49,7 @@ function logOnUncaughtAndUnhandled() { class TestServiceLocator extends RavenServerLocator { public getCommandArguments() { const cliOpts = [ - "--ServerUrl=http://127.0.0.1:0", + "--ServerUrl=http://127.0.0.1:0", "--ServerUrl.Tcp=tcp://127.0.0.1:38884", "--Features.Availability=Experimental" ]; @@ -137,6 +137,8 @@ export class RavenTestContext extends RavenTestDriver implements IDisposable { public static isPullRequest = !process.env["RAVEN_License"]; + public static is60Server = process.env["RAVENDB_SERVER_VERSION"] >= "6.0"; + private readonly _locator: RavenServerLocator; private readonly _securedLocator: RavenServerLocator; From 1a9f65e0df0a32676693996f6b9101a5894d461e Mon Sep 17 00:00:00 2001 From: Marcin Lewandowski Date: Sat, 15 Jul 2023 15:35:29 +0200 Subject: [PATCH 2/3] using hubName instead of hubDefinitionName --- .../Operations/Replication/PullReplicationAsSink.ts | 5 ++++- test/Ported/Server/Replication/PullReplicationTest.ts | 6 +++--- test/Utils/ReplicationTestContext.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Documents/Operations/Replication/PullReplicationAsSink.ts b/src/Documents/Operations/Replication/PullReplicationAsSink.ts index 14fc267f1..9870d88a7 100644 --- a/src/Documents/Operations/Replication/PullReplicationAsSink.ts +++ b/src/Documents/Operations/Replication/PullReplicationAsSink.ts @@ -10,5 +10,8 @@ export interface PullReplicationAsSink extends ExternalReplicationBase { accessName?: string; hubName?: string; + /** + * @deprecated Use HubName instead + */ hubDefinitionName?: string; -} \ No newline at end of file +} diff --git a/test/Ported/Server/Replication/PullReplicationTest.ts b/test/Ported/Server/Replication/PullReplicationTest.ts index f1ceb07f2..88753bab2 100644 --- a/test/Ported/Server/Replication/PullReplicationTest.ts +++ b/test/Ported/Server/Replication/PullReplicationTest.ts @@ -238,7 +238,7 @@ import { delay } from "../../../../src/Utility/PromiseUtil"; const pull: PullReplicationAsSink = { database: hub2.database, connectionStringName: "ConnectionString2-" + sink.database, - hubDefinitionName: definitionName2, + hubName: definitionName2, taskId: pullTasks[0].taskId, mode: "HubToSink" }; @@ -366,7 +366,7 @@ import { delay } from "../../../../src/Utility/PromiseUtil"; const pull: PullReplicationAsSink = { database: hub.database, connectionStringName: "ConnectionString-" + sink.database, - hubDefinitionName: definitionName, + hubName: definitionName, disabled: true, taskId: pullTasks[0].taskId, mode: "HubToSink" @@ -514,7 +514,7 @@ async function setupPullReplication(remoteName: string, sink: IDocumentStore, .. const pull: PullReplicationAsSink = { database: store.database, connectionStringName: "ConnectionString-" + store.database, - hubDefinitionName: remoteName, + hubName: remoteName, mode: "HubToSink" }; diff --git a/test/Utils/ReplicationTestContext.ts b/test/Utils/ReplicationTestContext.ts index 89aab5986..edb216744 100644 --- a/test/Utils/ReplicationTestContext.ts +++ b/test/Utils/ReplicationTestContext.ts @@ -62,7 +62,7 @@ export class ReplicationTestContext { let op: IMaintenanceOperation; - if ("hubDefinitionName" in watcher) { + if ("hubName" in watcher) { op = new UpdatePullReplicationAsSinkOperation(watcher as PullReplicationAsSink); } else { op = new UpdateExternalReplicationOperation(watcher); From c14b904d12a1075ca0c6f0feb69001a9f432bc6d Mon Sep 17 00:00:00 2001 From: Marcin Lewandowski Date: Sat, 15 Jul 2023 15:43:34 +0200 Subject: [PATCH 3/3] allow to run v5.2 client against v6.0 server --- test/Ported/Issues/RavenDB_8328Test.ts | 4 ++-- test/Ported/RevisionsTest.ts | 4 ++-- test/Ported/Suggestions/SuggestionsTest.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Ported/Issues/RavenDB_8328Test.ts b/test/Ported/Issues/RavenDB_8328Test.ts index 526362a60..27f656ac5 100644 --- a/test/Ported/Issues/RavenDB_8328Test.ts +++ b/test/Ported/Issues/RavenDB_8328Test.ts @@ -1,12 +1,12 @@ import * as assert from "assert"; -import { testContext, disposeTestDocumentStore } from "../../Utils/TestUtil"; +import { testContext, disposeTestDocumentStore, RavenTestContext } from "../../Utils/TestUtil"; import { IDocumentStore, PointField, WktField, QueryStatistics, } from "../../../src"; -describe("Issue RavenDB-8328", function () { +(RavenTestContext.is60Server ? describe.skip : describe)("Issue RavenDB-8328", function () { let store: IDocumentStore; diff --git a/test/Ported/RevisionsTest.ts b/test/Ported/RevisionsTest.ts index 7be3d7639..41051613b 100644 --- a/test/Ported/RevisionsTest.ts +++ b/test/Ported/RevisionsTest.ts @@ -1,5 +1,5 @@ import * as assert from "assert"; -import { testContext, disposeTestDocumentStore } from "../Utils/TestUtil"; +import { testContext, disposeTestDocumentStore, RavenTestContext } from "../Utils/TestUtil"; import { ConfigureRevisionsOperation, @@ -21,7 +21,7 @@ import { RevisionsResult } from "../../src/Documents/Operations/Revisions/Revisi import { delay } from "../../src/Utility/PromiseUtil"; -describe("RevisionsTest", function () { +(RavenTestContext.is60Server ? describe.skip : describe)("RevisionsTest", function () { let store: IDocumentStore; diff --git a/test/Ported/Suggestions/SuggestionsTest.ts b/test/Ported/Suggestions/SuggestionsTest.ts index d74e1879d..aa40ca293 100644 --- a/test/Ported/Suggestions/SuggestionsTest.ts +++ b/test/Ported/Suggestions/SuggestionsTest.ts @@ -1,10 +1,10 @@ import * as assert from "assert"; import { IDocumentStore, IndexDefinition, IndexFieldOptions, PutIndexesOperation, SuggestionOptions } from "../../../src"; -import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil"; +import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil"; import { Users_ByName } from "../Indexing/IndexesFromClientTest"; -describe("SuggestionsTest", function () { +(RavenTestContext.is60Server ? describe.skip : describe)("SuggestionsTest", function () { let store: IDocumentStore;