From 2511b658da5e7cc262d19d029fc0143ebeef1d20 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Mon, 26 Aug 2024 17:26:29 +0200
Subject: [PATCH] Fix tests

---
 .../Tests/Fixtures/cache_complex.test         |  4 +-
 .../Tests/Fixtures/inline_css.test            | 49 +++++++++----------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/extra/cache-extra/Tests/Fixtures/cache_complex.test b/extra/cache-extra/Tests/Fixtures/cache_complex.test
index 30aa729a2..206865088 100644
--- a/extra/cache-extra/Tests/Fixtures/cache_complex.test
+++ b/extra/cache-extra/Tests/Fixtures/cache_complex.test
@@ -3,9 +3,9 @@
 --TEMPLATE--
 {% cache 'test_%s_%s'|format(10, 10000) ttl(36000) %}
    {% set content %}
-      OK
+      ok
    {% endset %}
-   {% apply spaceless %}
+   {% apply upper %}
        {{ content }}
     {% endapply %}
 {% endcache %}
diff --git a/extra/cssinliner-extra/Tests/Fixtures/inline_css.test b/extra/cssinliner-extra/Tests/Fixtures/inline_css.test
index 8ba561f55..7142b9e71 100644
--- a/extra/cssinliner-extra/Tests/Fixtures/inline_css.test
+++ b/extra/cssinliner-extra/Tests/Fixtures/inline_css.test
@@ -1,40 +1,29 @@
 --TEST--
 "inline_css" filter
 --TEMPLATE--
-{% apply inline_css|spaceless %}
-    <html>
-        <style>p { color: red }</style>
-        <p>Great!</p>
-    </html>
+{% apply inline_css %}
+    <html><style>p { color: red }</style><p>Great!</p></html>
 {% endapply %}
 
 
-{% apply inline_css(source('css'))|spaceless %}
-    <html>
-        <p>Great!</p>
-    </html>
+{% apply inline_css(source('css')) %}
+    <html><p>Great!</p></html>
 {% endapply %}
 
 
-{% apply inline_css(source('css'), source('more_css'))|spaceless %}
-    <html>
-        <p>Great!</p>
-    </html>
+{% apply inline_css(source('css'), source('more_css')) %}
+    <html><p>Great!</p></html>
 {% endapply %}
 
 
-{% apply inline_css(source('css') ~ source('more_css'))|spaceless %}
-    <html>
-        <p>Great!</p>
-    </html>
+{% apply inline_css(source('css') ~ source('more_css')) %}
+    <html><p>Great!</p></html>
 {% endapply %}
 
 
-{{ include('html')|inline_css(source('css') ~ source('more_css'))|spaceless }}
+{{ include('html')|inline_css(source('css') ~ source('more_css')) }}
 --TEMPLATE(html)--
-    <html>
-        <p>Great!</p>
-    </html>
+    <html><p>Great!</p></html>
 --TEMPLATE(css)--
 p { color: red }
 --TEMPLATE(more_css)--
@@ -42,12 +31,20 @@ p { color: blue }
 --DATA--
 return []
 --EXPECT--
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"><html><head><style>p { color: red }</style></head><body><p style="color: red;">Great!</p></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head><style>p { color: red }</style></head>
+<body><p style="color: red;">Great!</p></body>
+</html>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"><html><body><p style="color: red;">Great!</p></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><p style="color: red;">Great!</p></body></html>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"><html><body><p style="color: blue;">Great!</p></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><p style="color: blue;">Great!</p></body></html>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"><html><body><p style="color: blue;">Great!</p></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><p style="color: blue;">Great!</p></body></html>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"><html><body><p style="color: blue;">Great!</p></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><p style="color: blue;">Great!</p></body></html>