From f0f258cea8b8cc34ecdfae7f817b407955f2d8be Mon Sep 17 00:00:00 2001
From: sunnavy <sunnavy@bestpractical.com>
Date: Fri, 9 Feb 2024 14:16:40 -0500
Subject: [PATCH] Avoid the newline after <textarea> tag to make WWW::Mechanize
 happy

Like the removed $TODO says: WWW::Mechanize doesn't strip newline following
<textarea> tag like browsers do.
---
 share/html/Admin/Elements/ModifyTemplate |  6 ++----
 t/web/template.t                         | 16 ++--------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/share/html/Admin/Elements/ModifyTemplate b/share/html/Admin/Elements/ModifyTemplate
index 91beda13931..946ed511909 100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
@@ -85,8 +85,7 @@
     <&|/l&>Headers</&>:
   </div>
   <div class="value col-8">
-    <textarea name="Headers" class="form-control" rows="10" cols="80" wrap="soft">
-<%$Headers||''%></textarea>
+    <textarea name="Headers" class="form-control" rows="10" cols="80" wrap="soft"><%$Headers||''%></textarea>
   </div>
 </div>
 <div class="form-row">
@@ -94,8 +93,7 @@
     <&|/l&>Body</&>:
   </div>
   <div class="value col-8">
-    <textarea name="Body" class="form-control" rows="25" cols="80" wrap="soft">
-<%$Body||''%></textarea>
+    <textarea name="Body" class="form-control" rows="25" cols="80" wrap="soft"><%$Body||''%></textarea>
   </div>
 </div>
 </&>
diff --git a/t/web/template.t b/t/web/template.t
index 098a91c727a..f552e3f170f 100644
--- a/t/web/template.t
+++ b/t/web/template.t
@@ -64,13 +64,7 @@ is($m->value('Type'), 'Perl', 'now that we have ExecuteCode we can update Type t
   my $headers = $m->value('Headers');
   my $body    = $m->value('Body');
 
-  TODO: {
-
-    local $TODO = "WWW::Mechanize doesn't strip newline following <textarea> tag like browsers do";
-    # this test fails because earlier tests add newlines when using Mech
-    like($headers, qr/^Subject: Resolved/, 'got expected Content');
-
-  }
+  like($headers, qr/^Subject: Resolved/, 'got expected Content');
 
   $m->field(Body => "$body\n\n\n$body");
   $m->submit;
@@ -81,12 +75,6 @@ is($m->value('Type'), 'Perl', 'now that we have ExecuteCode we can update Type t
   $m->form_name('ModifyTemplate');
   $m->submit;
 
-  TODO: {
-
-    local $TODO = "WWW::Mechanize doesn't strip newline following <textarea> tag like browsers do";
-    # this test fails because the template change makes Mech continuously add newlines where browsers dont
-    $m->content_unlike(qr{Template \d+: Content updated});
-
-  }
+  $m->content_unlike(qr{Template \d+: Content updated});
 }