diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java index bdfd6879da..1685cbc8aa 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java @@ -80,12 +80,12 @@ public class CssLinkResourceTransformerTests { Resource css = new ClassPathResource("test/main.css", getClass()); String expected = "\n" + - "@import url(\"/static/bar-11e16cf79faee7ac698c805cf28248d2.css\");\n" + - "@import url('/static/bar-11e16cf79faee7ac698c805cf28248d2.css');\n" + + "@import url(\"/static/bar-11e16cf79faee7ac698c805cf28248d2.css?#iefix\");\n" + + "@import url('/static/bar-11e16cf79faee7ac698c805cf28248d2.css#bla-normal');\n" + "@import url(/static/bar-11e16cf79faee7ac698c805cf28248d2.css);\n\n" + "@import \"/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css\";\n" + "@import '/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css';\n\n" + - "body { background: url(\"/static/images/image-f448cd1d5dba82b774f3202c878230b3.png\") }\n"; + "body { background: url(\"/static/images/image-f448cd1d5dba82b774f3202c878230b3.png?#iefix\") }\n"; StepVerifier.create(this.transformerChain.transform(exchange, css).cast(TransformedResource.class)) .consumeNextWith(resource -> { diff --git a/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css index a6265ea7ac..d9de66a95d 100644 --- a/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css +++ b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css @@ -1,9 +1,9 @@ -@import url("bar.css"); -@import url('bar.css'); +@import url("bar.css?#iefix"); +@import url('bar.css#bla-normal'); @import url(bar.css); @import "foo.css"; @import 'foo.css'; -body { background: url("images/image.png") } +body { background: url("images/image.png?#iefix") } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java index 172b1d62c0..6b7f0b0493 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java @@ -85,12 +85,12 @@ public class CssLinkResourceTransformerTests { TransformedResource actual = (TransformedResource) this.transformerChain.transform(this.request, css); String expected = "\n" + - "@import url(\"/static/bar-11e16cf79faee7ac698c805cf28248d2.css\");\n" + - "@import url('/static/bar-11e16cf79faee7ac698c805cf28248d2.css');\n" + + "@import url(\"/static/bar-11e16cf79faee7ac698c805cf28248d2.css?#iefix\");\n" + + "@import url('/static/bar-11e16cf79faee7ac698c805cf28248d2.css#bla-normal');\n" + "@import url(/static/bar-11e16cf79faee7ac698c805cf28248d2.css);\n\n" + "@import \"/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css\";\n" + "@import '/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css';\n\n" + - "body { background: url(\"/static/images/image-f448cd1d5dba82b774f3202c878230b3.png\") }\n"; + "body { background: url(\"/static/images/image-f448cd1d5dba82b774f3202c878230b3.png?#iefix\") }\n"; String result = new String(actual.getByteArray(), StandardCharsets.UTF_8); result = StringUtils.deleteAny(result, "\r"); diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/main.css b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/main.css index a6265ea7ac..d9de66a95d 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/main.css +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/resource/test/main.css @@ -1,9 +1,9 @@ -@import url("bar.css"); -@import url('bar.css'); +@import url("bar.css?#iefix"); +@import url('bar.css#bla-normal'); @import url(bar.css); @import "foo.css"; @import 'foo.css'; -body { background: url("images/image.png") } +body { background: url("images/image.png?#iefix") }