Fix license refereces and other test failures

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/formattedcode/output_html.py

@@ -84,7 +84,13 @@ def process_codebase(self, codebase, html, **kwargs):
             license_references = codebase.attributes.license_references
         template_loc = join(TEMPLATES_DIR, 'html', 'template.html')
         output_file = html
-        write_templated(output_file, results, license_references, version, template_loc)
+        write_templated(
+            output_file=output_file,
+            results=results,
+            license_references=license_references,
+            version=version,
+            template_loc=template_loc,
+        )
 
 
 @output_impl

src/formattedcode/templates/html/template.html

@@ -259,41 +259,42 @@
     </table>
     {% endif %}
 
-    {% if licenses %}
+    {% if license_references %}
     <table>
-      <caption>Licenses</caption>
+      <caption>License References</caption>
       <thead>
         <tr>
           <th>key</th>
           <th>short_name</th>
           <th>category</th>
           <th>owner</th>
-          <th>reference_url</th>
+          <th>scancode_url</th>
+          <th>licensedb_url</th>
           <th>homepage_url</th>
-          <th>text_url</th>
+          <th>text_urls</th>
           <th>spdx_license_key</th>
           <th>spdx_url</th>
         </tr>
       </thead>
       <tbody>
-        {% for license_reference in license_references %}
-          <tr id="license_{{ license_reference.key }}">
-            <td>{{ license_reference.key }}</td>
-            <td>{{ license_reference.short_name }}</td>
-            <td>{{ license_reference.category }}</td>
-            <td>{{ license_reference.owner }}</td>
-            <td>{{ license_reference.scancode_url|urlize(target='_blank') }}</td>
-            <td>{{ license_reference.licensedb_url|urlize(target='_blank') }}</td>
-            <td>{{ license_reference.homepage_url|urlize(target='_blank') }}</td>
-            <td>
-              {% for text_url in license_reference.text_urls %}
-                {{ text_url|urlize(target='_blank') }}
-              {% endfor %}
-            </td>
-            <td>{{ license_reference.spdx_license_key }}</td>
-            <td>{{ license_reference.spdx_url|urlize(target='_blank') }}</td>
-          </tr>
-        {% endfor %}
+      {% for license_reference in license_references %}
+        <tr id="license_{{ license_reference.key }}">
+          <td>{{ license_reference.key }}</td>
+          <td>{{ license_reference.short_name }}</td>
+          <td>{{ license_reference.category }}</td>
+          <td>{{ license_reference.owner }}</td>
+          <td>{{ license_reference.scancode_url|urlize(target='_blank') }}</td>
+          <td>{{ license_reference.licensedb_url|urlize(target='_blank') }}</td>
+          <td>{{ license_reference.homepage_url|urlize(target='_blank') }}</td>
+          <td>
+            {% for text_url in license_reference.text_urls %}
+              {{ text_url|urlize(target='_blank') }}
+            {% endfor %}
+          </td>
+          <td>{{ license_reference.spdx_license_key }}</td>
+          <td>{{ license_reference.spdx_url|urlize(target='_blank') }}</td>
+        </tr>
+      {% endfor %}
       </tbody>
     </table>
     {% endif %}

tests/scancode/data/help/help.txt

@@ -61,8 +61,6 @@ Options:
     --cyclonedx-xml FILE    Write scan output in CycloneDX XML format to FILE.
     --spdx-rdf FILE         Write scan output as SPDX RDF to FILE.
     --spdx-tv FILE          Write scan output as SPDX Tag/Value to FILE.
-    --html-app FILE         (DEPRECATED: use the ScanCode Workbench app instead )
-                            Write scan output as a mini HTML application to FILE.
 
   output filters:
     --ignore-author <pattern>       Ignore a file (and all its findings) if an