fix: add options for corporate proxy support

fix SAP#285
uxkjaer · Jan 7, 2022 · 50db05c · 50db05c
1 parent e37d52c
commit 50db05c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/packages/language-server/src/ui5-model.ts b/packages/language-server/src/ui5-model.ts
@@ -1,5 +1,5 @@
 import { map } from "lodash";
-import fetch from "node-fetch";
+import fetch from "node-fetch-with-proxy";
 import { resolve } from "path";
 import { pathExists, lstat, readJson, writeJson, mkdirs } from "fs-extra";
 

diff --git a/packages/language-server/test/ui5-model-spec.ts b/packages/language-server/test/ui5-model-spec.ts
@@ -15,7 +15,7 @@ import { forEach, isPlainObject } from "lodash";
 
 describe("the UI5 language assistant ui5 model", () => {
   // The default timeout is 2000ms and getSemanticModel can take ~3000-5000ms
-  const GET_MODEL_TIMEOUT = 10000;
+  const GET_MODEL_TIMEOUT = 20000;
   const VERSION = "1.71.14";
   const NO_CACHE_FOLDER = undefined;
 

diff --git a/packages/semantic-model/test/api-spec.ts b/packages/semantic-model/test/api-spec.ts
@@ -237,6 +237,8 @@ context("The ui5-language-assistant semantic model package API", () => {
 
   function createModelConsistencyTests(version: TestModelVersion): void {
     describe(`Model generated from ${version}`, () => {
+      this.timeout(25000);
+
       before(async () => {
         await downloadLibraries(version);
       });
@@ -293,6 +295,8 @@ context("The ui5-language-assistant semantic model package API", () => {
   }
 
   describe("returned model is frozen", () => {
+    this.timeout(25000);
+
     const readOnlyMessageMatcher = "read only";
     const objectNotExtensibleMatcher = "not extensible";
     const cannotDeleteMatcher = "Cannot delete";
@@ -353,6 +357,8 @@ context("The ui5-language-assistant semantic model package API", () => {
 
   describe("API JSON fixes", () => {
     let model: UI5SemanticModel;
+    this.timeout(25000);
+
     before(async () => {
       model = await generateModel({
         version: "1.74.0",

diff --git a/test-packages/test-utils/src/utils/download-ui5-resources.ts b/test-packages/test-utils/src/utils/download-ui5-resources.ts
@@ -1,7 +1,7 @@
 import { zipObject, keys, map, noop } from "lodash";
 import { resolve } from "path";
 import { writeFile, mkdirs, pathExists } from "fs-extra";
-import fetch from "node-fetch";
+import fetch from "node-fetch-with-proxy";
 import { TestModelVersion } from "../../api";
 
 // Disable this flag if you want/need spam/info in the tests logs.