From a05e09d3452cbb95221a0c47672281efa9bee3ba Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 14 Mar 2024 11:02:02 -0700
Subject: [PATCH] fixed testing

---
 app/templates/views/check/preview.html | 44 ++++++++++----------------
 tests/app/main/views/test_send.py      | 18 +++++------
 2 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html
index 86b173677..ea7978ebe 100644
--- a/app/templates/views/check/preview.html
+++ b/app/templates/views/check/preview.html
@@ -42,25 +42,6 @@
     </ul>
   </div>
   <div class="usa-table-container--scrollable" tabindex="0">
-    <!-- {% call(item, row_number) list_table(
-      recipients.displayed_rows,
-      caption="Note: Only the first 5 rows are displayed here.",
-      caption_visible=True,
-      field_headings=recipients.column_headers
-    ) %}
-      {% for column in recipients.column_headers %}
-        {% if item[column].ignore %}
-          {{ text_field(item[column].data or '', status='default') }}
-        {% else %}
-          {{ text_field(item[column].data or '') }}
-        {% endif %}
-      {% endfor %}
-      {% if item[None].data %}
-        {% for column in item[None].data %}
-          {{ text_field(column, status='default') }}
-        {% endfor %}
-      {% endif %}
-    {% endcall %} -->
     <table class="usa-table usa-table--borderless width-full">
       <caption class="font-body-lg table-heading">
         Note: Only the first 5 rows are displayed here.
@@ -79,22 +60,29 @@
         <tr class="table-row">
           {% for column in recipients.column_headers %}
             <td class="table-field-left-aligned">
-              <div class="">
-                {% if item[column].ignore %}
-                  {{ item[column].data or '' }}
+              <div>
+                {% set column_data = item[column].data or '' %}
+                {% if column_data is iterable and column_data is not string %}
+                  <ul>
+                    {% for data_item in column_data %}
+                      {% if data_item is not none %}
+                        <li>{{ data_item }}</li>
+                      {% endif %}
+                    {% endfor %}
+                  </ul>
                 {% else %}
-                  {{ item[column].data or '' }}
+                  {{ column_data }}
                 {% endif %}
               </div>
             </td>
           {% endfor %}
           {% if item[None].data %}
             {% for column in item[None].data %}
-            <td class="table-field-left-aligned">
-              <div class="">
-                {{ column }}
-              </div>
-            </td>
+              <td class="table-field-left-aligned">
+                <div class="">
+                  {{ column }}
+                </div>
+              </td>
             {% endfor %}
           {% endif %}
         </tr>
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 35309f57f..949852824 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -975,11 +975,11 @@ def test_upload_valid_csv_shows_preview_and_table(
     for row_index, row in enumerate(
         [
             (
-                '<td class="table-field-left-aligned"> <div class=""> 2028675301 </div> </td>',
-                '<td class="table-field-left-aligned"> <div class=""> A </div> </td>',
+                '<td class="table-field-left-aligned"> <div> 2028675301 </div> </td>',
+                '<td class="table-field-left-aligned"> <div> A </div> </td>',
                 (
                     '<td class="table-field-left-aligned"> '
-                    '<div class="table-field-status-default"> '
+                    '<div> '
                     "<ul> "
                     "<li>foo</li> <li>foo</li> <li>foo</li> "
                     "</ul> "
@@ -988,11 +988,11 @@ def test_upload_valid_csv_shows_preview_and_table(
                 ),
             ),
             (
-                '<td class="table-field-left-aligned"> <div class=""> 2028675302 </div> </td>',
-                '<td class="table-field-left-aligned"> <div class=""> B </div> </td>',
+                '<td class="table-field-left-aligned"> <div> 2028675302 </div> </td>',
+                '<td class="table-field-left-aligned"> <div> B </div> </td>',
                 (
                     '<td class="table-field-left-aligned"> '
-                    '<div class="table-field-status-default"> '
+                    '<div> '
                     "<ul> "
                     "<li>foo</li> <li>foo</li> <li>foo</li> "
                     "</ul> "
@@ -1001,11 +1001,11 @@ def test_upload_valid_csv_shows_preview_and_table(
                 ),
             ),
             (
-                '<td class="table-field-left-aligned"> <div class=""> 2028675303 </div> </td>',
-                '<td class="table-field-left-aligned"> <div class=""> C </div> </td>',
+                '<td class="table-field-left-aligned"> <div> 2028675303 </div> </td>',
+                '<td class="table-field-left-aligned"> <div> C </div> </td>',
                 (
                     '<td class="table-field-left-aligned"> '
-                    '<div class="table-field-status-default"> '
+                    '<div> '
                     "<ul> "
                     "<li>foo</li> <li>foo</li> "
                     "</ul> "