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

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

Merged
merged 3 commits into from
Jul 15, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd31547
allow to run v5.2 client against v6.0 server
ml054 Jul 15, 2023
1a9f65e
using hubName instead of hubDefinitionName
ml054 Jul 15, 2023
c14b904
allow to run v5.2 client against v6.0 server
ml054 Jul 15, 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/RavenClient.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
ravendb_version:
description: 'RavenDB Version'
required: true
type: string
type: string

jobs:
build:
Expand All @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion src/Documents/Operations/Replication/PullReplicationAsSink.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ export interface PullReplicationAsSink extends ExternalReplicationBase {
accessName?: string;
hubName?: string;

/**
* @deprecated Use HubName instead
*/
hubDefinitionName?: string;
}
}
4 changes: 2 additions & 2 deletions test/Ported/Graph/BasicGraphQueriesTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions test/Ported/Graph/ClientGraphQueriesTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -233,4 +233,4 @@ class FriendDescriptor {
this.friendsSince = friendsSince;
this.friendId = friendId;
}
}
}
4 changes: 2 additions & 2 deletions test/Ported/Issues/RavenDB_8328Test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions test/Ported/RevisionsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as assert from "assert";
import { testContext, disposeTestDocumentStore } from "../Utils/TestUtil";
import { testContext, disposeTestDocumentStore, RavenTestContext } from "../Utils/TestUtil";

import {
ConfigureRevisionsOperation,
Expand All @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions test/Ported/Server/Replication/PullReplicationTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
};

Expand Down
4 changes: 2 additions & 2 deletions test/Ported/Suggestions/SuggestionsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion test/Utils/ReplicationTestContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion test/Utils/TestUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
];
Expand Down Expand Up @@ -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;

Expand Down
Loading