From c78024c0982750ca13c76fc40532ab2039000d2a Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 28 May 2024 12:30:55 -0400
Subject: [PATCH 1/3] remove fieldset markup

---
 src/registrar/templates/profile.html | 38 +++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html
index 70081698c..a672005f7 100644
--- a/src/registrar/templates/profile.html
+++ b/src/registrar/templates/profile.html
@@ -41,35 +41,33 @@ Edit your User Profile |
 
     <form class="usa-form usa-form--large" method="post" novalidate>
       {% csrf_token %}
-      <fieldset class="usa-fieldset">
 
-        {% input_with_errors form.first_name %}
+      {% input_with_errors form.first_name %}
 
-        {% input_with_errors form.middle_name %}
-    
-        {% input_with_errors form.last_name %}
-    
-        {% input_with_errors form.title %}
+      {% input_with_errors form.middle_name %}
+  
+      {% input_with_errors form.last_name %}
+  
+      {% input_with_errors form.title %}
 
-        {% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
+      {% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
 
-        {% with link_href=login_help_url %}
-          {% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
-            {% with link_text="Get help with your Login.gov account" %}
-              {% with target_blank=True %}
-                {% with do_not_show_max_chars=True %}
-                  {% input_with_errors form.email %}
-                {% endwith %}
+      {% with link_href=login_help_url %}
+        {% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
+          {% with link_text="Get help with your Login.gov account" %}
+            {% with target_blank=True %}
+              {% with do_not_show_max_chars=True %}
+                {% input_with_errors form.email %}
               {% endwith %}
             {% endwith %}
           {% endwith %}
         {% endwith %}
-    
-        {% with add_class="usa-input--medium" %}
-          {% input_with_errors form.phone %}
-        {% endwith %}
+      {% endwith %}
+  
+      {% with add_class="usa-input--medium" %}
+        {% input_with_errors form.phone %}
+      {% endwith %}
 
-      </fieldset>
       <button type="submit" class="usa-button">Save</button>
     </form>
 </main>

From e048a73e82b93d80e62537020ee1fb1db014391d Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 28 May 2024 12:47:49 -0400
Subject: [PATCH 2/3] test teardown cleanup

---
 src/registrar/tests/test_views.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index f2c3ad4b7..8c8a0fda0 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -528,6 +528,8 @@ class UserProfileTests(TestWithUser, WebTest):
         self.role.delete()
         self.domain.delete()
         Contact.objects.all().delete()
+        DraftDomain.objects.all().delete()
+        DomainRequest.objects.all().delete()
 
     @less_console_noise_decorator
     def error_500_main_nav_with_profile_feature_turned_on(self):
@@ -635,9 +637,6 @@ class UserProfileTests(TestWithUser, WebTest):
             self.assertContains(response, "Your profile")
             response = self.client.get(f"/domain-request/{domain_request.id}/withdraw")
             self.assertContains(response, "Your profile")
-        # cleanup
-        domain_request.delete()
-        site.delete()
 
     @less_console_noise_decorator
     def test_request_when_profile_feature_off(self):

From b8781da51ade7dff457c6d004d843a607cf7b9d4 Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 28 May 2024 12:53:52 -0400
Subject: [PATCH 3/3] edit the getgov href to use the right var instead of
 hardcoded value

---
 src/registrar/templates/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html
index a672005f7..13179e4ac 100644
--- a/src/registrar/templates/profile.html
+++ b/src/registrar/templates/profile.html
@@ -32,7 +32,7 @@ Edit your User Profile |
     {% include "includes/form_errors.html" with form=form %}
 
     <h1>Your profile</h1>
-    <p>We <a href="https://get.gov/domains/requirements/#what-.gov-domain-registrants-must-do" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
+    <p>We <a href="{% public_site_url 'domains/requirements/#what-.gov-domain-registrants-must-do' %}" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
     
     <h2>Contact information</h2>
     <p>Review the details below and update any required information. Note that editing this information won’t affect your Login.gov account information.</p>