Adapt tests to new behavior of FileSystem._runGlob which now throws f…

…or GLOB errors
SAP · May 23, 2019 · 925909f · 925909f
1 parent 4fb9d6d
commit 925909f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/test/lib/builder/builder.js b/test/lib/builder/builder.js
@@ -918,8 +918,7 @@ const libraryITree = {
 			}
 		},
 		"pathMappings": {
-			"/resources/": "main/src",
-			"/test-resources/": "main/test"
+			"/resources/": "main/src"
 		}
 	}
 };
@@ -968,8 +967,7 @@ const themeJTree = {
 			}
 		},
 		"pathMappings": {
-			"/resources/": "main/src",
-			"/test-resources/": "main/test"
+			"/resources/": "main/src"
 		}
 	}
 };
diff --git a/test/lib/tasks/bundlers/generateManifestBundle.js b/test/lib/tasks/bundlers/generateManifestBundle.js
@@ -8,7 +8,7 @@ const assert = chai.assert;
 const ui5Builder = require("../../../../");
 const builder = ui5Builder.builder;
 const applicationBPath = path.join(__dirname, "..", "..", "..", "fixtures", "application.b");
-const libraryCore = path.join(__dirname, "..", "..", "fixtures", "sap.ui.core-evo");
+const libraryCore = path.join(__dirname, "..", "..", "..", "fixtures", "sap.ui.core-evo");
 const libraryKPath = path.join(__dirname, "..", "..", "..", "fixtures", "library.k");
 const {promisify} = require("util");
 const extractZip = promisify(require("extract-zip"));
@@ -95,7 +95,7 @@ const applicationBTree = {
 		{
 			"id": "library.d",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "library.d"),
+			"path": path.join(applicationBPath, "..", "library.d"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -120,7 +120,7 @@ const applicationBTree = {
 		{
 			"id": "library.a",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.a"),
+			"path": path.join(applicationBPath, "..", "collection", "library.a"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -145,7 +145,7 @@ const applicationBTree = {
 		{
 			"id": "library.b",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.b"),
+			"path": path.join(applicationBPath, "..", "collection", "library.b"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -170,7 +170,7 @@ const applicationBTree = {
 		{
 			"id": "library.c",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.c"),
+			"path": path.join(applicationBPath, "..", "collection", "library.c"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -257,8 +257,7 @@ const libraryKTree = {
 			}
 		},
 		"pathMappings": {
-			"/resources/": "src",
-			"/test-resources/": "test"
+			"/resources/": "src"
 		}
 	}
 };
diff --git a/test/lib/tasks/bundlers/generateStandaloneAppBundle.js b/test/lib/tasks/bundlers/generateStandaloneAppBundle.js
@@ -219,7 +219,7 @@ const applicationBTree = {
 		{
 			"id": "library.d",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "library.d"),
+			"path": path.join(applicationBPath, "..", "library.d"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -244,7 +244,7 @@ const applicationBTree = {
 		{
 			"id": "library.a",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.a"),
+			"path": path.join(applicationBPath, "..", "collection", "library.a"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -269,7 +269,7 @@ const applicationBTree = {
 		{
 			"id": "library.b",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.b"),
+			"path": path.join(applicationBPath, "..", "collection", "library.b"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",
@@ -294,7 +294,7 @@ const applicationBTree = {
 		{
 			"id": "library.c",
 			"version": "1.0.0",
-			"path": path.join(applicationBPath, "node_modules", "collection", "library.c"),
+			"path": path.join(applicationBPath, "..", "collection", "library.c"),
 			"dependencies": [],
 			"_level": 1,
 			"specVersion": "0.1",