aa-intel-tool 1.1.3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html

@@ -4,17 +4,17 @@
 {% translate "Unaffiliated / No Alliance" as no_alliance %}
 
 <div class="col-md-6 col-lg-3 aa-intel-chatscan-alliances">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h2 class="aa-intel-section-title">
             {% translate "Alliances breakdown" as table_title %}
             {{ table_title|title }} (<span id="aa-intel-alliances-count">0</span>)
         </h2>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="table-local-scan table-local-scan-alliances table-aa-intel">
-                <table class="table table-condensed table-sortable aa-intel-alliance-participation-list" style="width: 100%;">
+    <div class="card card-default border-0">
+        <div class="card-body">
+            <div class="table-local-scan table-local-scan-alliances table-aa-intel d-none">
+                <table class="table table-sm table-sortable aa-intel-alliance-participation-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>{% translate "Alliance" %}</th>
@@ -24,13 +24,13 @@
                 </table>
             </div>
 
-            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-alliance-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-alliance-participation-list aa-callout aa-callout-info">
                 <p>
                     {% translate "Loading data …" %}
                 </p>
             </div>
 
-            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-alliance-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-alliance-participation-list aa-callout aa-callout-info d-none">
                 <p>
                     {% translate "No data …" %}
                 </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html

@@ -4,17 +4,17 @@
 {% translate "Unaffiliated / No Alliance" as no_alliance %}
 
 <div class="col-md-6 col-lg-3 aa-intel-chatscan-corporations">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h2 class="aa-intel-section-title">
             {% translate "Corporations breakdown" as table_title %}
             {{ table_title|title }} (<span id="aa-intel-corporations-count">0</span>)
         </h2>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="table-local-scan table-local-scan-corporations table-aa-intel">
-                <table class="table table-condensed table-sortable aa-intel-corporation-participation-list" style="width: 100%;">
+    <div class="card card-default border-0">
+        <div class="card-body">
+            <div class="table-local-scan table-local-scan-corporations table-aa-intel d-none">
+                <table class="table table-sm table-sortable aa-intel-corporation-participation-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>{% translate "Corporation" %}</th>
@@ -24,13 +24,13 @@
                 </table>
             </div>
 
-            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-corporation-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-corporation-participation-list aa-callout aa-callout-info">
                 <p>
                     {% translate "Loading data …" %}
                 </p>
             </div>
 
-            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-corporation-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-corporation-participation-list aa-callout aa-callout-info d-none">
                 <p>
                     {% translate "No data …" %}
                 </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html

@@ -3,17 +3,17 @@
 {% translate "Unaffiliated / No Alliance" as no_alliance %}
 
 <div class="col-md-12 col-lg-6 aa-intel-chatscan-pilots">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h2 class="aa-intel-section-title">
             {% translate "Pilots breakdown" as table_title %}
             {{ table_title|title }} (<span id="aa-intel-pilots-count">0</span>)
         </h2>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="table-local-scan table-local-scan-pilots table-aa-intel">
-                <table class="table table-sortable table-condensed aa-intel-pilot-participation-list" style="width: 100%;">
+    <div class="card card-default border-0">
+        <div class="card-body">
+            <div class="table-local-scan table-local-scan-pilots table-aa-intel d-none">
+                <table class="table table-sortable table-sm aa-intel-pilot-participation-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>{% translate "Pilot" %}</th>
@@ -24,13 +24,13 @@
                 </table>
             </div>
 
-            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-pilot-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-pilot-participation-list aa-callout aa-callout-info">
                 <p>
                     {% translate "Loading data …" %}
                 </p>
             </div>
 
-            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-pilot-participation-list bs-callout bs-callout-info">
+            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-pilot-participation-list aa-callout aa-callout-info d-none">
                 <p>
                     {% translate "No data …" %}
                 </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html

@@ -1,17 +1,17 @@
 {% load i18n %}
 
-<div class="col-sm-6 col-md-4 col-lg-3 col-aa-intel col-aa-intel-{{ dscan_section }}">
-    <header class="aa-intel-section-header">
+<div class="col-sm-6 col-md-4 col-lg-3 col-aa-intel col-aa-intel-{{ dscan_section }} d-none">
+    <header class="aa-intel-section-header my-4">
         <h3 class="aa-intel-section-title">
             {{ section_header|title }}
             (<span id="aa-intel-dscan-{{ dscan_section }}-count">0</span>)
         </h3>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card card-default border-0">
+        <div class="card-body">
             <div class="table-dscan table-dscan-{{ dscan_section }} table-aa-intel">
-                <table class="table table-condensed table-sortable aa-intel-dscan-{{ dscan_section }}-list" style="width: 100%;">
+                <table class="table table-sm table-sortable aa-intel-dscan-{{ dscan_section }}-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>{% translate "Type" %}</th>
@@ -20,13 +20,13 @@
                     </thead>
                 </table>
 
-                <div class="aa-intel-loading-table-info aa-intel-loading-table-info-{{ dscan_section }} bs-callout bs-callout-info">
+                <div class="aa-intel-loading-table-info aa-intel-loading-table-info-{{ dscan_section }} aa-callout aa-callout-info d-none">
                     <p>
                         {% translate "Loading data …" %}
                     </p>
                 </div>
 
-                <div class="aa-intel-empty-table-info aa-intel-empty-table-info-{{ dscan_section }} bs-callout bs-callout-info">
+                <div class="aa-intel-empty-table-info aa-intel-empty-table-info-{{ dscan_section }} aa-callout aa-callout-info d-none">
                     <p>
                         {% translate "No data …" %}
                     </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 
-<div class="aa-intel-result-row aa-intel-dscan-result row" id="aa-intel-dscan-row-interesting-on-grid">
+<div class="aa-intel-result-row aa-intel-dscan-result row d-none" id="aa-intel-dscan-row-interesting-on-grid">
     <div class="clearfix">
         <div class="col-sm-6 col-md-4 col-lg-4 clearfix">
-            <header class="aa-intel-section-header">
+            <header class="aa-intel-section-header my-4">
                 <h2>
                     {% translate "Interesting on grid" as section_header %}
                     {{ section_header|title }}

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="col-md-4 col-sm-6 col-lg-3 col-aa-intel col-aa-intel-dscan-ship-classes-{{ dscan_section }}">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h3 class="aa-intel-section-title">
             {{ section_header|title }}
 
@@ -11,10 +11,10 @@
         </h3>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="table-dscan table-dscan-ship-classes table-dscan-ship-classes-{{ dscan_section }} table-aa-intel">
-                <table class="table table-condensed table-sortable aa-intel-dscan-ship-classes aa-intel-dscan-ship-classes-{{ dscan_section }}-list" style="width: 100%;">
+    <div class="card card-default border-0">
+        <div class="card-body">
+            <div class="table-dscan table-dscan-ship-classes table-dscan-ship-classes-{{ dscan_section }} table-aa-intel d-none">
+                <table class="table table-sm table-sortable aa-intel-dscan-ship-classes aa-intel-dscan-ship-classes-{{ dscan_section }}-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>
@@ -27,13 +27,13 @@
                 </table>
             </div>
 
-            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-{{ dscan_section }} bs-callout bs-callout-info">
+            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-{{ dscan_section }} aa-callout aa-callout-info">
                 <p>
                     {% translate "Loading data …" %}
                 </p>
             </div>
 
-            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-{{ dscan_section }} bs-callout bs-callout-info">
+            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-{{ dscan_section }} aa-callout aa-callout-info d-none">
                 <p>
                     {% translate "No data …" %}
                 </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html

@@ -1,17 +1,17 @@
 {% load i18n %}
 
 <div class="col-md-4 col-sm-6 col-lg-3 col-aa-intel col-aa-intel-dscan-ship-types">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h3 class="aa-intel-section-title">
             {% translate "Ship types" as section_header %}
             {{ section_header|title }}
         </h3>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
-            <div class="table-dscan table-dscan-ship-types table-aa-intel">
-                <table class="table table-condensed table-sortable table-no-images aa-intel-dscan-ship-types aa-intel-dscan-ship-types-list" style="width: 100%;">
+    <div class="card card-default border-0">
+        <div class="card-body">
+            <div class="table-dscan table-dscan-ship-types table-aa-intel d-none">
+                <table class="table table-sm table-sortable table-no-images aa-intel-dscan-ship-types aa-intel-dscan-ship-types-list" style="width: 100%;">
                     <thead>
                     <tr>
                         <th>
@@ -25,13 +25,13 @@
             </div>
 
 
-            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-ship-types bs-callout bs-callout-info">
+            <div class="aa-intel-loading-table-info aa-intel-loading-table-info-ship-types aa-callout aa-callout-info">
                 <p>
                     {% translate "Loading data …" %}
                 </p>
             </div>
 
-            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-ship-types bs-callout bs-callout-info">
+            <div class="aa-intel-empty-table-info aa-intel-empty-table-info-ship-types aa-callout aa-callout-info d-none">
                 <p>
                     {% translate "No data." %}
                 </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown.html

@@ -3,7 +3,7 @@
 <div class="aa-intel-result-row aa-intel-dscan-result row" id="aa-intel-dscan-row-ships-breakdown">
     <div class="clearfix">
         <div class="col-sm-6 col-md-4 col-lg-4 clearfix">
-            <header class="aa-intel-section-header">
+            <header class="aa-intel-section-header my-4">
                 <h2>
                     {% translate "Ships on scan" as section_header %}
                     {{ section_header|title }}

aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/system-information.html

@@ -1,9 +1,9 @@
 {% load i18n %}
 
-<div class="aa-intel-result-row aa-intel-dscan-result row" id="aa-intel-dscan-row-system-information">
+<div class="aa-intel-result-row aa-intel-dscan-result row d-none" id="aa-intel-dscan-row-system-information">
     <div class="clearfix">
         <div class="col-sm-6 col-md-4 col-lg-4 clearfix">
-            <header class="aa-intel-section-header">
+            <header class="aa-intel-section-header my-4">
                 <h2>
                     {% translate "System information" as section_header %}
                     {{ section_header|title }}

aa_intel_tool/templates/aa_intel_tool/partials/scan/evetime.html

@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<div class="aa-intel-scan-evetime">
+<div class="aa-intel-scan-evetime my-4">
     <p>
         {% translate "Scan taken at (Eve time)" %}: {{ scan.created|date:"Y-m-d H:i" }}
     </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html

@@ -1,17 +1,17 @@
 {% load i18n %}
 
 <div class="col-md-12 col-lg-6 col-aa-intel col-aa-intel-fleetcomp-pilot-ships">
-    <header class="aa-intel-section-header">
+    <header class="aa-intel-section-header my-4">
         <h3 class="aa-intel-section-title">
             {% translate "Who is flying what" as section_header %}
             {{ section_header|title }}
         </h3>
     </header>
 
-    <div class="panel panel-default">
-        <div class="panel-body">
+    <div class="card card-default border-0">
+        <div class="card-body">
             <div class="table-dscan table-fleetcomp-pilot-ships table-aa-intel">
-                <table class="table table-condensed table-sortable aa-intel-fleetcomp-pilot-ships-list" style="width: 100%;">
+                <table class="table table-sm table-sortable aa-intel-fleetcomp-pilot-ships-list" style="width: 100%;">
                     <thead>
                         <tr>
                             <th>{% translate "Pilot" %}</th>
@@ -24,13 +24,13 @@
                     </thead>
                 </table>
 
-                <div class="aa-intel-loading-table-info aa-intel-loading-table-info-fleetcomp-pilot-ships bs-callout bs-callout-info">
+                <div class="aa-intel-loading-table-info aa-intel-loading-table-info-fleetcomp-pilot-ships aa-callout aa-callout-info">
                     <p>
                         {% translate "Loading data …" %}
                     </p>
                 </div>
 
-                <div class="aa-intel-empty-table-info aa-intel-empty-table-info-fleetcomp-pilot-ships bs-callout bs-callout-info">
+                <div class="aa-intel-empty-table-info aa-intel-empty-table-info-fleetcomp-pilot-ships aa-callout aa-callout-info d-none">
                     <p>
                         {% translate "No data …" %}
                     </p>

aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details.html

@@ -3,7 +3,7 @@
 <div class="local-scan-result row" id="aa-intel-fleetcomp-details-row">
     <div class="clearfix">
         <div class="col-sm-6 col-md-4 col-lg-4 clearfix">
-            <header class="aa-intel-section-header">
+            <header class="aa-intel-section-header my-4">
                 <h2>
                     {% translate "Fleet details" as section_header %}
                     {{ section_header|title }}

aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/participation.html

@@ -3,7 +3,7 @@
 <div class="local-scan-result row" id="aa-intel-fleetcomp-participation-row">
     <div class="clearfix">
         <div class="col-sm-6 col-md-4 col-lg-4 clearfix">
-            <header class="aa-intel-section-header">
+            <header class="aa-intel-section-header my-4">
                 <h2>
                     {% translate "Participation details" as section_header %}
                     {{ section_header|title }}

aa_intel_tool/templates/aa_intel_tool/views/index.html

@@ -3,16 +3,11 @@
 {% load evelinks %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Intel Parser" %}{% endblock %}
-
 {% block aa_intel_tool_header %}
-    <header>
-        <h1>{% translate "Intel Parser" %}</h1>
-    </header>
-
-    <p>
-        {% translate "Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …" %}
-    </p>
+    {% if not user.is_authenticated %}
+        {% translate "Intel Parser" as translated_header %}
+        {% include "framework/header/page-header.html" with title=translated_header %}
+    {% endif %}
 {% endblock %}
 
 {% block aa_intel_tool_body %}

aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html

@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block extra_css %}
-    {% include "bundles/datatables-css.html" %}
+    {% include "bundles/datatables-css-bs5.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
 {% endblock %}
 
@@ -37,7 +37,7 @@
         }
     </script>
 
-    {% include "bundles/datatables-js.html" %}
+    {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/clipboard-js.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-js-l10n.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-chatscan-js.html" %}

aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html

@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block extra_css %}
-    {% include "bundles/datatables-css.html" %}
+    {% include "bundles/datatables-css-bs5.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
 {% endblock %}
 
@@ -39,7 +39,7 @@
         }
     </script>
 
-    {% include "bundles/datatables-js.html" %}
+    {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/clipboard-js.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-js-l10n.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-dscan-js.html" %}

aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html

@@ -22,7 +22,7 @@
 {% endblock %}
 
 {% block extra_css %}
-    {% include "bundles/datatables-css.html" %}
+    {% include "bundles/datatables-css-bs5.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
 {% endblock %}
 
@@ -40,7 +40,7 @@
         }
     </script>
 
-    {% include "bundles/datatables-js.html" %}
+    {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/clipboard-js.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-js-l10n.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-fleetcomp-js.html" %}

aa_intel_tool/tests/test_access.py

@@ -12,6 +12,9 @@ from django.urls import reverse
 # Alliance Auth (External Libs)
 from app_utils.testing import create_fake_user
 
+# AA Intel Tool
+from aa_intel_tool.tests.utils import response_content_to_str
+
 
 class TestAccess(TestCase):
     """
@@ -32,22 +35,21 @@ class TestAccess(TestCase):
         )
 
         cls.html_menu = f"""
-            <li>
-                <a class="active" href="{reverse('aa_intel_tool:intel_tool_index')}">
-                    <i class="fas fa-clipboard-list fa-fw"></i>
+            <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
+                <i class="nav-link fa-solid fa-clipboard-list fa-fw align-self-center me-3 active"></i>
+                <a class="nav-link flex-fill align-self-center me-auto" href="{reverse('aa_intel_tool:intel_tool_index')}">
                     Intel Parser
                 </a>
             </li>
         """
 
-        cls.header = """
+        cls.header_top = '<div class="navbar-brand">Intel Parser</div>'
+
+        cls.header_public_page = """
             <div class="aa-intel-tool-header">
-                <header>
-                    <h1>Intel Parser</h1>
-                </header>
-                <p>
-                    Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …
-                </p>
+                <h1 class="page-header text-center mb-3">
+                    Intel Parser
+                </h1>
             </div>
         """
 
@@ -66,8 +68,14 @@ class TestAccess(TestCase):
         )
 
         self.assertEqual(first=response.status_code, second=HTTPStatus.OK)
-        self.assertContains(response=response, text=self.html_menu, html=True)
-        self.assertContains(response=response, text=self.header, html=True)
+        # self.assertContains(response=response, text=self.html_menu, html=True)
+        # self.assertContains(response=response, text=self.header_top, html=True)
+        self.assertInHTML(
+            needle=self.html_menu, haystack=response_content_to_str(response)
+        )
+        self.assertInHTML(
+            needle=self.header_top, haystack=response_content_to_str(response)
+        )
 
     def test_access_to_index_as_public_page(self):
         """
@@ -82,4 +90,7 @@ class TestAccess(TestCase):
         )
 
         self.assertEqual(first=response.status_code, second=HTTPStatus.OK)
-        self.assertContains(response=response, text=self.header, html=True)
+        # self.assertContains(response=response, text=self.header_public_page, html=True)
+        self.assertInHTML(
+            needle=self.header_public_page, haystack=response_content_to_str(response)
+        )

aa_intel_tool/tests/test_auth_hooks.py

@@ -12,6 +12,9 @@ from django.urls import reverse
 # Alliance Auth (External Libs)
 from app_utils.testing import create_fake_user
 
+# AA Intel Tool
+from aa_intel_tool.tests.utils import response_content_to_str
+
 
 class TestHooks(TestCase):
     """
@@ -32,22 +35,19 @@ class TestHooks(TestCase):
         )
 
         cls.html_menu = f"""
-            <li>
-                <a class href="{reverse('aa_intel_tool:intel_tool_index')}">
-                    <i class="fas fa-clipboard-list fa-fw"></i>
+            <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
+                <i class="nav-link fa-solid fa-clipboard-list fa-fw align-self-center me-3 "></i>
+                <a class="nav-link flex-fill align-self-center me-auto" href="{reverse('aa_intel_tool:intel_tool_index')}">
                     Intel Parser
                 </a>
             </li>
         """
 
-        cls.header = """
+        cls.header_public_page = """
             <div class="aa-intel-tool-header">
-                <header>
-                    <h1>Intel Parser</h1>
-                </header>
-                <p>
-                    Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …
-                </p>
+                <h1 class="page-header text-center mb-3">
+                    Intel Parser
+                </h1>
             </div>
         """
 
@@ -64,7 +64,10 @@ class TestHooks(TestCase):
         response = self.client.get(path=reverse(viewname="authentication:dashboard"))
 
         self.assertEqual(first=response.status_code, second=HTTPStatus.OK)
-        self.assertContains(response=response, text=self.html_menu, html=True)
+        # self.assertContains(response=response, text=self.html_menu, html=True)
+        self.assertInHTML(
+            needle=self.html_menu, haystack=response_content_to_str(response)
+        )
 
     def test_render_hook_with_public_page(self):
         """
@@ -79,4 +82,7 @@ class TestHooks(TestCase):
         )
 
         self.assertEqual(first=response.status_code, second=HTTPStatus.OK)
-        self.assertContains(response=response, text=self.header, html=True)
+        # self.assertContains(response=response, text=self.header, html=True)
+        self.assertInHTML(
+            needle=self.header_public_page, haystack=response_content_to_str(response)
+        )

aa_intel_tool/tests/test_parser.py

@@ -84,7 +84,7 @@ class TestParserGeneral(TestCase):
         expected_exception = ParserError
         expected_message = "A parser error occurred » No suitable parser found. Input is not a supported intel type or malformed …"  # pylint: disable=line-too-long
 
-        with self.assertRaises(ParserError):
+        with self.assertRaises(expected_exception=expected_exception):
             check_intel_type(scan_data=scan_data)
 
         with self.assertRaisesMessage(

aa_intel_tool/tests/test_templatetags.py

@@ -2,7 +2,6 @@
 Tests for the template tags
 """
 
-
 # Django
 from django.test import TestCase
 
@@ -13,7 +12,7 @@ from aa_intel_tool.tests.utils import render_template
 
 class TestForumVersionedStatic(TestCase):
     """
-    Tests for inteltool_versioned_static template tag
+    Tests for aa_intel_tool template tag
     """
 
     def test_versioned_static(self):
@@ -26,7 +25,7 @@ class TestForumVersionedStatic(TestCase):
 
         rendered_template = render_template(
             string=(
-                "{% load inteltool_versioned_static %}"
+                "{% load aa_intel_tool %}"
                 "{% aa_intel_tool_static 'aa_intel_tool/css/aa-intel-tool.min.css' %}"
             ),
             context=context,

aa_intel_tool/tests/utils.py

@@ -6,6 +6,7 @@ Helper for our tests
 from pathlib import Path
 
 # Django
+from django.core.handlers.wsgi import WSGIRequest
 from django.template import Context, Template
 
 
@@ -65,3 +66,16 @@ def load_fleetcomp_txt() -> str:
     """
 
     return (Path(__file__).parent / "test-data/fleetcomp.txt").read_text()
+
+
+def response_content_to_str(response: WSGIRequest) -> str:
+    """
+    Return the content of a WSGIRequest response as string
+
+    :param response:
+    :type response:
+    :return:
+    :rtype:
+    """
+
+    return response.content.decode(response.charset)

aa_intel_tool/views/general.py

@@ -74,7 +74,9 @@ def index(request: WSGIRequest) -> HttpResponse:
         context = {"form": form, "app_settings": AppSettings}
 
     return render(
-        request=request, template_name="aa_intel_tool/views/index.html", context=context
+        request=request,
+        template_name="aa_intel_tool/views/index.html",
+        context=context,
     )