skipped some of tests on 6.0

Author: ml054

test/Ported/Documents/CanQueryAndIncludeRevisions.ts

@@ -1,9 +1,9 @@
 import { AbstractJavaScriptIndexCreationTask, IDocumentStore } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat } from "../../Utils/AssertExtensions";
 import { delay } from "bluebird";
 
-describe("CanQueryAndIncludeRevisionsTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("CanQueryAndIncludeRevisionsTest", function () {
 
     let store: IDocumentStore;
 

test/Ported/ForceRevisionCreation.ts

@@ -1,12 +1,12 @@
 import { IDocumentStore } from "../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../Utils/TestUtil";
 import { Company } from "../Assets/Entities";
 import { assertThat, assertThrows } from "../Utils/AssertExtensions";
 import { RevisionsConfiguration } from "../../src/Documents/Operations/RevisionsConfiguration";
 import { RevisionsCollectionConfiguration } from "../../src/Documents/Operations/RevisionsCollectionConfiguration";
 import { ConfigureRevisionsOperation } from "../../src/Documents/Operations/Revisions/ConfigureRevisionsOperation";
 
-describe("ForceRevisionCreation", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("ForceRevisionCreation", function () {
 
     let store: IDocumentStore;
 

test/Ported/Issues/RavenDB_13456.ts

@@ -5,11 +5,11 @@ import {
     PutClientConfigurationOperation,
     SessionOptions
 } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { Company } from "../../Assets/Entities";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_13456", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13456", function () {
 
     let store: IDocumentStore;
 

test/Ported/Issues/RavenDB_13735.ts

@@ -1,5 +1,5 @@
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { RefreshConfiguration } from "../../../src/Documents/Operations/Refresh/RefreshConfiguration";
 import { ConfigureRefreshOperation } from "../../../src/Documents/Operations/Refresh/ConfigureRefreshOperation";
 import { User } from "../../Assets/Entities";
@@ -10,7 +10,7 @@ import { assertThat } from "../../Utils/AssertExtensions";
 import { delay } from "../../../src/Utility/PromiseUtil";
 import { DateUtil } from "../../../src/Utility/DateUtil";
 
-describe("RavenDB_13735", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13735", function () {
 
     let store: IDocumentStore;
 

test/Ported/Issues/RavenDB_13762.ts

@@ -1,12 +1,12 @@
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { User } from "../../Assets/Entities";
 import { RevisionsConfiguration } from "../../../src/Documents/Operations/RevisionsConfiguration";
 import { RevisionsCollectionConfiguration } from "../../../src/Documents/Operations/RevisionsCollectionConfiguration";
 import { ConfigureRevisionsOperation } from "../../../src/Documents/Operations/Revisions/ConfigureRevisionsOperation";
 import { assertThat } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_13762", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13762", function () {
 
     let store: IDocumentStore;
 

test/Ported/Issues/RavenDB_14724.ts

@@ -1,9 +1,9 @@
 import { ConfigureRevisionsOperation, IDocumentStore, RevisionsConfiguration } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { User } from "../../Assets/Entities";
 import { assertThat } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_14724", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("RavenDB_14724", function () {
 
     let store: IDocumentStore;
 

test/Ported/Issues/RavenDB_16328.ts

@@ -1,12 +1,12 @@
 import { IDocumentStore, SorterDefinition } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { Company } from "../../Assets/Entities";
 import { PutServerWideSortersOperation } from "../../../src/ServerWide/Operations/Sorters/PutServerWideSortersOperation";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 import { DeleteServerWideSorterOperation } from "../../../src/ServerWide/Operations/Sorters/DeleteServerWideSorterOperation";
 import { sorterCode } from "./RavenDB_8355";
 
-describe("RavenDB_16328", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_16328", function () {
 
     let store: IDocumentStore;
 
@@ -73,4 +73,4 @@ describe("RavenDB_16328", function () {
 
 function getSorter(sorterName: string) {
     return sorterCode.replace(/MySorter/g, sorterName);
-}
+}

test/Ported/Issues/RavenDB_16328_Analyzers.ts

@@ -1,11 +1,11 @@
 import { AbstractJavaScriptIndexCreationTask, IDocumentStore, ResetIndexOperation } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 import { AnalyzerDefinition } from "../../../src/Documents/Indexes/Analysis/AnalyzerDefinition";
 import { DeleteServerWideAnalyzerOperation } from "../../../src/ServerWide/Operations/Analyzers/DeleteServerWideAnalyzerOperation";
 import { PutServerWideAnalyzersOperation } from "../../../src/ServerWide/Operations/Analyzers/PutServerWideAnalyzersOperation";
 
-describe("RavenDB_16328_AnalyzersTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_16328_AnalyzersTest", function () {
 
     let store: IDocumentStore;
 

test/Ported/Server/ExpirationConfigurationTest.ts

@@ -1,10 +1,10 @@
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat } from "../../Utils/AssertExtensions";
 import { ConfigureExpirationOperation } from "../../../src/Documents/Operations/Expiration/ConfigureExpirationOperation";
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
 import { ExpirationConfiguration } from "../../../src/Documents/Operations/Expiration/ExpirationConfiguration";
 
-describe("ExpirationConfigurationTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("ExpirationConfigurationTest", function () {
 
     let store: IDocumentStore;
 
@@ -27,4 +27,4 @@ describe("ExpirationConfigurationTest", function () {
         assertThat(expirationOperationResult.raftCommandIndex)
             .isNotNull();
     });
-});
+});

test/Ported/Subscriptions/RevisionsSubscriptionsTest.ts

@@ -1,5 +1,5 @@
 import { Company, User } from "../../Assets/Entities";
-import { testContext, disposeTestDocumentStore } from "../../Utils/TestUtil";
+import { testContext, disposeTestDocumentStore, RavenTestContext } from "../../Utils/TestUtil";
 
 import DocumentStore, {
     IDocumentStore,
@@ -12,7 +12,7 @@ import * as assert from "assert";
 // skipped for the time being
 // subscriptions are not working with server version 4.1
 // due to RavenDB-12127
-describe("RevisionsSubscriptionsTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RevisionsSubscriptionsTest", function () {
     this.timeout(5 * 10 * 1000);
 
     let store: IDocumentStore;
@@ -238,11 +238,11 @@ describe("RevisionsSubscriptionsTest", function () {
             const actualPreviousNames = items
                 .filter(x => x.rawResult.previous)
                 .map(x => x.rawResult.previous.name);
-            
+
             actualPreviousNames.sort();
             assert.strictEqual(actualPreviousNames.length, 9);
             assert.strictEqual(
-                JSON.stringify(actualPreviousNames), 
+                JSON.stringify(actualPreviousNames),
                 JSON.stringify(expectedNames.filter(x => x !== "users1 ver 9")));
 
         } finally {