Merge pull request #383 from ml054/v5.2

allow to run v5.2 client against v6.0 server

Author: ml054

.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:

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;
-}
+}

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;
 

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;
     }
-}
+}

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;
 

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;
 

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"
         };
 

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;
 

test/Utils/ReplicationTestContext.ts

@@ -62,7 +62,7 @@ export class ReplicationTestContext {
 
         let op: IMaintenanceOperation<ModifyOngoingTaskResult>;
 
-        if ("hubDefinitionName" in watcher) {
+        if ("hubName" in watcher) {
             op = new UpdatePullReplicationAsSinkOperation(watcher as PullReplicationAsSink);
         } else {
             op = new UpdateExternalReplicationOperation(watcher);

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;