Merge pull request #470 from ml054/RDBC-885

RDBC-885 Add 7.0 to GHA RavenDB version matrix

Author: ml054

test/Ported/Indexing/TimeSeries/BasicTimeSeriesIndexes_JavaScriptTest.ts

@@ -326,7 +326,7 @@ class AverageHeartRateDaily_ByDateAndCity extends AbstractRawJavaScriptTimeSerie
             " .aggregate(g => ({\n" +
             "     heartBeat: g.values.reduce((total, val) => val.heartBeat + total, 0) / g.values.reduce((total, val) => val.count + total, 0),\n" +
             "     date: g.key.date,\n" +
-            "     city: g.key.city\n" +
+            "     city: g.key.city,\n" +
             "     count: g.values.reduce((total, val) => val.count + total, 0)\n" +
             " }))";
     }

test/Ported/Issues/RavenDB_11440.ts

@@ -4,12 +4,12 @@ import {
     SetLogsConfigurationOperation,
     LogMode
 } from "../../../src/index.js";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil.js";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil.js";
 import { throwError } from "../../../src/Exceptions/index.js";
 import { TimeUtil } from "../../../src/Utility/TimeUtil.js";
 import { assertThat } from "../../Utils/AssertExtensions.js";
 
-describe("RavenDB_11440", function () {
+(RavenTestContext.is70Server ? describe.skip : describe)("RavenDB_11440", function () {
 
     let store: IDocumentStore;
 

test/Ported/Server/LogsConfigurationTest.ts

@@ -4,10 +4,10 @@ import {
     SetLogsConfigurationOperation,
     SetLogsConfigurationParameters
 } from "../../../src/index.js";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil.js";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil.js";
 import { assertThat } from "../../Utils/AssertExtensions.js";
 
-describe("LogsConfigurationTest", function () {
+(RavenTestContext.is70Server ? describe.skip : describe)("LogsConfigurationTest", function () {
 
     let store: IDocumentStore;
 

test/Utils/TestUtil.ts

@@ -135,6 +135,8 @@ class TestSecuredServiceLocator extends RavenServerLocator {
 
 export class RavenTestContext extends RavenTestDriver implements IDisposable {
 
+    public static is70Server = process.env["RAVENDB_SERVER_VERSION"] >= "7.0";
+
     public static isPullRequest = !process.env["RAVEN_License"];
 
     private readonly _locator: RavenServerLocator;