[INTERNAL] Add url() params to tests

RandomByte · RandomByte · commit a1f6b3a05b0a · 2021-06-22T14:58:41.000+02:00
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/base/library-RTL.css b/test/expected/libraries/lib1/my/ui/lib/themes/base/library-RTL.css
@@ -6,4 +6,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%2C%22url1%22%3A%22url(%27111%27)%22%7D')}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/base/library.css b/test/expected/libraries/lib1/my/ui/lib/themes/base/library.css
@@ -6,4 +6,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%2C%22url1%22%3A%22url(%27111%27)%22%7D')}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/foo/css_variables.css b/test/expected/libraries/lib1/my/ui/lib/themes/foo/css_variables.css
@@ -0,0 +1,4 @@
+
+
+/* Inline theming parameters */
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/foo/library-RTL.css b/test/expected/libraries/lib1/my/ui/lib/themes/foo/library-RTL.css
@@ -10,4 +10,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/foo/library.css b/test/expected/libraries/lib1/my/ui/lib/themes/foo/library.css
@@ -10,4 +10,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton-RTL.css b/test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton-RTL.css
@@ -0,0 +1,10 @@
+.myUiLibRule1 {
+  color: var(--color1);
+}
+.myUiLibRule2 {
+  padding: 1px 2px 3px 4px;
+}
+.fooContrast.myUiLibRule1,
+.fooContrast .myUiLibRule1 {
+  color: var(--color1);
+}
diff --git a/test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton.css b/test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton.css
@@ -0,0 +1,10 @@
+.myUiLibRule1 {
+  color: var(--color1);
+}
+.myUiLibRule2 {
+  padding: 1px 2px 3px 4px;
+}
+.fooContrast.myUiLibRule1,
+.fooContrast .myUiLibRule1 {
+  color: var(--color1);
+}
diff --git a/test/expected/libraries/lib2/my/ui/lib/themes/bar/library-RTL.css b/test/expected/libraries/lib2/my/ui/lib/themes/bar/library-RTL.css
@@ -10,4 +10,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%7D%2C%22scopes%22%3A%7B%22barContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22barContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
diff --git a/test/expected/libraries/lib2/my/ui/lib/themes/bar/library.css b/test/expected/libraries/lib2/my/ui/lib/themes/bar/library.css
@@ -10,4 +10,4 @@
 }
 
 /* Inline theming parameters */
-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%7D%2C%22scopes%22%3A%7B%22barContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22barContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
diff --git a/test/fixtures/libraries/lib1/my/ui/lib/themes/base/global.less b/test/fixtures/libraries/lib1/my/ui/lib/themes/base/global.less
@@ -1 +1,2 @@
 @color1: #fefefe;
+@url1: url('111');
diff --git a/test/test-css-vars.js b/test/test-css-vars.js
@@ -2,6 +2,7 @@
 "use strict";
 
 const assert = require("assert");
+const path = require("path");
 const readFile = require("./common/helper").readFile;
 
 // tested module
@@ -33,4 +34,44 @@ describe("css vars", function() {
 				"css variables should be correctly generated.");
 		});
 	});
+
+	it("should generate the correct css variables for foo theme", function() {
+		return new Builder().build({
+			lessInputPath: "my/ui/lib/themes/foo/library.source.less",
+			rootPaths: [
+				"test/fixtures/libraries/lib1",
+				"test/fixtures/libraries/lib2"
+			],
+			library: {
+				name: "my.ui.lib"
+			},
+			cssVariables: true
+		}).then(function(result) {
+			const oVariablesExpected = {
+				"default": {
+					"color1": "#ffffff",
+					"url1": "url('../base/111')",
+
+				},
+				"scopes": {
+					"fooContrast": {
+						"color1": "#000000"
+					}
+				}
+			};
+
+			assert.equal(result.css, readFile("test/expected/libraries/lib1/my/ui/lib/themes/foo/library.css"),
+				"css should be correctly generated.");
+			assert.equal(result.cssRtl, readFile("test/expected/libraries/lib1/my/ui/lib/themes/foo/library-RTL.css"),
+				"rtl css should be correctly generated.");
+			assert.deepEqual(result.variables, oVariablesExpected, "variables should be correctly collected.");
+			assert.deepEqual(result.allVariables, oVariablesExpected, "allVariables should be correctly collected.");
+			assert.equal(result.cssSkeleton, readFile("test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton.css"),
+				"library_skeleton.css should be correctly generated.");
+			assert.equal(result.cssSkeleton, readFile("test/expected/libraries/lib1/my/ui/lib/themes/foo/library_skeleton-RTL.css"),
+				"library_skeleton-RTL.css should be correctly generated.");
+			assert.equal(result.cssVariables, readFile("test/expected/libraries/lib1/my/ui/lib/themes/foo/css_variables.css"),
+				"css variables should be correctly generated.");
+		});
+	});
 });
diff --git a/test/test-perf-workaround.js b/test/test-perf-workaround.js
@@ -34,7 +34,7 @@ describe("performance workaround", function() {
 			const oVariablesExpected = {
 				"default": {
 					"color1": "#ffffff",
-
+					"url1": "url('../base/111')",
 				},
 				"scopes": {
 					"fooContrast": {
diff --git a/test/test.js b/test/test.js
@@ -118,8 +118,18 @@ describe("libraries (my/ui/lib)", function() {
 		}).then(function(result) {
 			assert.equal(result.css, readFile("test/expected/libraries/lib1/my/ui/lib/themes/base/library.css"), "css should be correctly generated.");
 			assert.equal(result.cssRtl, readFile("test/expected/libraries/lib1/my/ui/lib/themes/base/library-RTL.css"), "rtl css should be correctly generated.");
-			assert.deepEqual(result.variables, {color1: "#fefefe"}, "variables should be correctly collected.");
-			assert.deepEqual(result.allVariables, {color1: "#fefefe"}, "allVariables should be correctly collected.");
+			assert.deepEqual(result.variables,
+				{
+					color1: "#fefefe",
+					url1: "url('111')",
+				},
+				"variables should be correctly collected.");
+			assert.deepEqual(result.allVariables,
+				{
+					color1: "#fefefe",
+					url1: "url('111')",
+				},
+				"allVariables should be correctly collected.");
 			assert.deepEqual(result.imports, [
 				path.join("test", "fixtures", "libraries", "lib1", "my", "ui", "lib", "themes", "base", "library.source.less"),
 				path.join("test", "fixtures", "libraries", "lib1", "my", "ui", "lib", "themes", "base", "global.less")
@@ -141,6 +151,7 @@ describe("libraries (my/ui/lib)", function() {
 			const oVariablesExpected = {
 				"default": {
 					"color1": "#ffffff",
+					"url1": "url('../base/111')",
 
 				},
 				"scopes": {
@@ -180,6 +191,7 @@ describe("libraries (my/ui/lib)", function() {
 			const oVariablesExpected = {
 				"default": {
 					"color1": "#ffffff",
+					"url1": "url('../base/111')",
 				},
 				"scopes": {
 					"barContrast": {
@@ -248,7 +260,8 @@ describe("libraries (my/other/ui/lib)", function() {
 			assert.deepEqual(result.allVariables, {
 				"_my_other_ui_lib_MyControl_color1": "#fefefe",
 				"_my_other_ui_lib_MyOtherControl_color1": "#fefefe",
-				"color1": "#fefefe"
+				"color1": "#fefefe",
+				"url1": "url('../../../../../../my/ui/lib/themes/base/111')",
 			}, "allVariables should be correctly collected.");
 			assert.deepEqual(result.imports, [
 				path.join("test", "fixtures", "libraries", "lib3", "my", "other", "ui", "lib", "themes", "base", "library.source.less"),
@@ -289,7 +302,8 @@ describe("libraries (my/other/ui/lib)", function() {
 					"_my_other_ui_lib_MyControl_color1": "#ffffff",
 					"_my_other_ui_lib_MyControl_color2": "#008000",
 					"_my_other_ui_lib_MyOtherControl_color1": "#ffffff",
-					"color1": "#ffffff"
+					"color1": "#ffffff",
+					"url1": "url('../../../../../../my/ui/lib/themes/base/111')",
 				},
 				"scopes": {
 					"fooContrast": {
@@ -349,7 +363,8 @@ describe("libraries (my/other/ui/lib)", function() {
 					"_my_other_ui_lib_MyControl_color1": "#ffffff",
 					"_my_other_ui_lib_MyControl_color2": "#008000",
 					"_my_other_ui_lib_MyOtherControl_color1": "#ffffff",
-					"color1": "#ffffff"
+					"color1": "#ffffff",
+					"url1": "url('../../../../../../my/ui/lib/themes/base/111')",
 				},
 				"scopes": {
 					"barContrast": {
@@ -403,7 +418,8 @@ describe("inlineCssVariables / inlineThemingParameters", function() {
 			assert.deepStrictEqual(result.allVariables, {
 				"_my_other_ui_lib_MyControl_color1": "#fefefe",
 				"_my_other_ui_lib_MyOtherControl_color1": "#fefefe",
-				"color1": "#fefefe"
+				"color1": "#fefefe",
+				"url1": "url('../../../../../../my/ui/lib/themes/base/111')",
 			}, "allVariables should be correctly collected.");
 			assert.deepStrictEqual(result.imports, [
 				path.join("test", "fixtures", "libraries", "lib3", "my", "other", "ui", "lib", "themes", "base", "library.source.less"),

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`/* Inline theming parameters */`
`9`		`-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%7D')}`
	`9`	`+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22color1%22%3A%22%23fefefe%22%2C%22url1%22%3A%22url(%27111%27)%22%7D')}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
++
 +/* Inline theming parameters */
 +#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`/* Inline theming parameters */`
`13`		`-#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}`
	`13`	`+#sap-ui-theme-my\.ui\.lib{background-image:url('data:text/plain;utf-8,%7B%22default%22%3A%7B%22color1%22%3A%22%23ffffff%22%2C%22url1%22%3A%22url(%27..%2Fbase%2F111%27)%22%7D%2C%22scopes%22%3A%7B%22fooContrast%22%3A%7B%22color1%22%3A%22%23000000%22%7D%7D%7D')}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`@color1: #fefefe;`
	`2`	`+@url1: url('111');`