Merge pull request #34 from vpriesner/master

#33 Fixing integration tests as per @thibaultmeyer's suggestion
ninjaframework · Jan 3, 2022 · 1ef88b3 · 1ef88b3
2 parents d27e53e + 8a8f1f6
commit 1ef88b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...-appengine-integration-test-blog/src/main/java/views/ApplicationController/index.ftl.html b/...-appengine-integration-test-blog/src/main/java/views/ApplicationController/index.ftl.html
@@ -9,8 +9,8 @@
         <h1>
             <a href="/article/${frontArticle.id}">${frontArticle.title}</a>    
         </h1>  
-        <p>${frontArticle.postedAt?date}</p>  
-        <p><#noescape>${frontArticle.content}</#noescape></p>
+        <p>${frontArticle.postedAt?date}</p>
+        <p>${frontArticle.content?no_esc}</p>
     </div>
 </#if>
 

diff --git a/...ppengine-integration-test-blog/src/main/java/views/ArticleController/articleShow.ftl.html b/...ppengine-integration-test-blog/src/main/java/views/ArticleController/articleShow.ftl.html
@@ -5,8 +5,8 @@
 <#if article??>
 
     <h1>${article.title}</h1>  
-    <p>${article.postedAt?date}</p>  
-    <p><#noescape>${article.content}</#noescape></p>
+    <p>${article.postedAt?date}</p>
+    <p>${article.content?no_esc}</p>
 
 <#else>