From 8c5b2f426dcc0f53d7463dedb9b112338266a630 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Tue, 26 Jan 2021 15:08:51 +0000
Subject: [PATCH] Refactor asset audit tests with better selectors

Also fixed a silly title error with the modal
---
 assets/templates/asset_audit.html | 1 -
 assets/tests/pages.py             | 6 ++++++
 assets/tests/test_assets.py       | 9 ++++-----
 assets/views.py                   | 5 +++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index cc77dbe9..ca48a08a 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -1,6 +1,5 @@
 {% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %}
 {% load widget_tweaks %}
-{% block title %}Audit Asset {{ object.asset_id }}{% endblock %}
 
 {% block content %}
 <script>
diff --git a/assets/tests/pages.py b/assets/tests/pages.py
index 0605f55c..f7ff25b4 100644
--- a/assets/tests/pages.py
+++ b/assets/tests/pages.py
@@ -209,6 +209,8 @@ class AssetAuditList(AssetList):
         _errors_selector = (By.CLASS_NAME, "alert-danger")
         # Don't use the usual success selector - that tries and fails to hit the '10m long cable' helper button...
         _submit_locator = (By.ID, "id_mark_audited")
+        _close_selector = (By.XPATH, "//button[@data-dismiss='modal']")
+
         form_items = {
             'asset_id': (regions.TextBox, (By.ID, 'id_asset_id')),
             'description': (regions.TextBox, (By.ID, 'id_description')),
@@ -240,6 +242,10 @@ class AssetAuditList(AssetList):
             self.root.find_element(*self._submit_locator).click()
             # self.wait.until(lambda x: not self.is_displayed) TODO
 
+        def close(self):
+            self.page.find_element(*self._close_selector).click()
+            self.wait.until(expected_conditions.invisibility_of_element_located((By.ID, 'modal')))
+
         def remove_all_required(self):
             self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
             self.driver.execute_script("Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
diff --git a/assets/tests/test_assets.py b/assets/tests/test_assets.py
index 24246efb..7f467625 100644
--- a/assets/tests/test_assets.py
+++ b/assets/tests/test_assets.py
@@ -291,7 +291,7 @@ class TestAssetAudit(AutoLoginTest):
         self.wait = WebDriverWait(self.driver, 5)
 
     def test_audit_process(self):
-        asset_id = "1111"
+        selected_asset_id = "1111"
         self.page.set_query(asset_id)
         self.page.search()
         mdl = self.page.modal
@@ -311,7 +311,7 @@ class TestAssetAudit(AutoLoginTest):
         self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
 
         # Check data is correct
-        audited = models.Asset.objects.get(asset_id="1111")
+        audited = models.Asset.objects.get(asset_id=selected_asset_id)
         self.assertEqual(audited.description, new_desc)
         # Make sure audit 'log' was filled out
         self.assertEqual(self.profile.initials, audited.last_audited_by.initials)
@@ -323,13 +323,12 @@ class TestAssetAudit(AutoLoginTest):
         self.assertEqual(len(models.Asset.objects.filter(last_audited_at=None)), len(self.page.assets))
 
         asset_row = self.page.assets[0]
-        self.driver.find_element(By.XPATH, "//*[@id='asset_table_body']/tr[1]/td[4]/a").click()
+        self.driver.find_element(By.XPATH, "//a[contains(@class,'btn') and contains(., 'Audit')]").click()
         self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
         self.assertEqual(self.page.modal.asset_id, asset_row.id)
 
         # First close button is for the not found error
-        self.page.find_element(By.XPATH, '//*[@id="modal"]/div/div/div[1]/button').click()
-        self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
+        self.page.modal.close()
         self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
         # Make sure audit log was NOT filled out
         audited = models.Asset.objects.get(asset_id=asset_row.id)
diff --git a/assets/views.py b/assets/views.py
index cdcc719a..3461b020 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -211,6 +211,11 @@ class AssetAudit(AssetEdit):
     template_name = 'asset_audit.html'
     form_class = forms.AssetAuditForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Audit Asset: {}".format(self.object.display_id)
+        return context
+
     def get_success_url(self):
         # TODO For some reason this doesn't stick when done in form_valid??
         asset = self.get_object()