From 79d1e3b2111bf9fc6b4d2177c4bb7a6b7309e197 Mon Sep 17 00:00:00 2001 From: Maruf Rasully Date: Fri, 19 Jul 2024 15:36:49 +0200 Subject: [PATCH] fix: adapt unit test and default ui5 version --- packages/context/src/types.ts | 2 +- packages/context/test/unit/api.test.ts | 14 ++++++++++++++ packages/context/test/unit/ui5-model.test.ts | 2 +- test-packages/test-utils/api.d.ts | 2 +- test-packages/test-utils/src/api.ts | 2 +- .../src/utils/semantic-model-provider.ts | 4 ++-- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/packages/context/src/types.ts b/packages/context/src/types.ts index 29b1115d..af603f6c 100644 --- a/packages/context/src/types.ts +++ b/packages/context/src/types.ts @@ -7,7 +7,7 @@ import type { Manifest } from "@sap-ux/project-access"; import { FetchResponse } from "@ui5-language-assistant/logic-utils"; export const DEFAULT_UI5_FRAMEWORK = "SAPUI5"; -export const DEFAULT_UI5_VERSION = "1.71.61"; +export const DEFAULT_UI5_VERSION = "1.71.69"; export const DEFAULT_UI5_VERSION_BASE = "1.71"; export const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; export const UI5_FRAMEWORK_CDN_BASE_URL = { diff --git a/packages/context/test/unit/api.test.ts b/packages/context/test/unit/api.test.ts index 21b9715e..6e737a35 100644 --- a/packages/context/test/unit/api.test.ts +++ b/packages/context/test/unit/api.test.ts @@ -5,6 +5,7 @@ import * as services from "../../src/services"; import { UI5SemanticModel } from "@ui5-language-assistant/semantic-model-types"; import { getContext, isContext } from "../../src/api"; import type { Context } from "../../src/types"; +import * as projectAccess from "@sap-ux/project-access"; describe("context", () => { afterEach(() => { @@ -13,6 +14,7 @@ describe("context", () => { describe("getContext", () => { it("get context", async () => { + // arrange const getManifestDetailsStub = jest .spyOn(manifest, "getManifestDetails") .mockResolvedValue({ @@ -23,6 +25,14 @@ describe("context", () => { flexEnabled: false, minUI5Version: undefined, }); + const getManifestStub = jest + .spyOn(manifest, "getUI5Manifest") + .mockResolvedValue({ + minUI5Version: ["2.0.0", "1.126.0"], + }); + const getMinimumUI5VersionSub = jest + .spyOn(projectAccess, "getMinimumUI5Version") + .mockReturnValue("1.126.0"); const getCustomViewIdStub = jest .spyOn(manifest, "getCustomViewId") .mockResolvedValue("customViewId"); @@ -38,8 +48,12 @@ describe("context", () => { const getServicesStub = jest .spyOn(services, "getServices") .mockResolvedValue({}); + // act const result = await getContext("path/to/xml/file"); + // assert expect(getManifestDetailsStub).toHaveBeenCalled(); + expect(getManifestStub).toHaveBeenCalled(); + expect(getMinimumUI5VersionSub).toHaveBeenCalled(); expect(getCustomViewIdStub).toHaveBeenCalled(); expect(getYamlDetailsStub).toHaveBeenCalled(); expect(getSemanticModelStub).toHaveBeenCalled(); diff --git a/packages/context/test/unit/ui5-model.test.ts b/packages/context/test/unit/ui5-model.test.ts index b04f691a..9d50a5db 100644 --- a/packages/context/test/unit/ui5-model.test.ts +++ b/packages/context/test/unit/ui5-model.test.ts @@ -44,7 +44,7 @@ import { Response } from "node-fetch"; const GET_MODEL_TIMEOUT = 30000; const FRAMEWORK = "SAPUI5"; const OPEN_FRAMEWORK = "OpenUI5"; -const FALLBACK_VERSION = "1.71.61"; +const FALLBACK_VERSION = "1.71.69"; const FALLBACK_VERSION_BASE = "1.71"; const UI5_VERSION_S4_PLACEHOLDER = "${sap.ui5.dist.version}"; const NO_CACHE_FOLDER = undefined; diff --git a/test-packages/test-utils/api.d.ts b/test-packages/test-utils/api.d.ts index 567c605e..68d16aa4 100644 --- a/test-packages/test-utils/api.d.ts +++ b/test-packages/test-utils/api.d.ts @@ -88,7 +88,7 @@ export function buildUI5Model>( opts: Partial ): UI5SemanticModel & Pick; -export const DEFAULT_UI5_VERSION = "1.71.67"; +export const DEFAULT_UI5_VERSION = "1.71.69"; // TODO: list should be updated continuously! export type TestModelVersion = diff --git a/test-packages/test-utils/src/api.ts b/test-packages/test-utils/src/api.ts index 962d33a0..2471ffbb 100644 --- a/test-packages/test-utils/src/api.ts +++ b/test-packages/test-utils/src/api.ts @@ -31,4 +31,4 @@ export { } from "./utils/expect"; export { getFallbackPatchVersions } from "./utils/download-ui5-resources"; -export const DEFAULT_UI5_VERSION = "1.71.67"; +export const DEFAULT_UI5_VERSION = "1.71.69"; diff --git a/test-packages/test-utils/src/utils/semantic-model-provider.ts b/test-packages/test-utils/src/utils/semantic-model-provider.ts index e1c3a208..d4fed1e5 100644 --- a/test-packages/test-utils/src/utils/semantic-model-provider.ts +++ b/test-packages/test-utils/src/utils/semantic-model-provider.ts @@ -14,7 +14,7 @@ const MODEL_CACHE: Record = Object.create(null); const fixes: Record = { - "1.71.67": { + "1.71.69": { array: "any[]", Array: "any[]", bloolean: undefined, @@ -258,7 +258,7 @@ type LibraryFix = (content: Json) => void; // Library version -> library name -> fix function const libraryFixes: Record> = { - "1.71.67": {}, + "1.71.69": {}, "1.84.41": {}, "1.96.27": { "sap.ui.mdc": [