Revert "Does this help the coverage be less weird?"

This reverts commit 39ab9df836.

PyRIGS/tests/base.py

@@ -20,9 +20,6 @@ def create_datetime(year, month, day, hour, min):
 def create_browser():
     options = webdriver.ChromeOptions()
     options.add_argument("--window-size=1920,1080")
-    # No caching, please and thank you
-    options.add_argument("--aggressive-cache-discard")
-    options.add_argument("--disk-cache-size=0")
     options.add_argument("--headless")
     if settings.CI:
         options.add_argument("--no-sandbox")

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>

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):
+            previous_errors = self.errors
+            self.page.find_element(*self._close_selector).click()
+
         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\")});")

assets/tests/test_assets.py

@@ -294,24 +294,22 @@ class TestAssetAudit(AutoLoginTest):
         asset_id = "1111"
         self.page.set_query(asset_id)
         self.page.search()
-        mdl = self.page.modal
         self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
         # Do it wrong on purpose to check error display
-        mdl.remove_all_required()
-        mdl.description = ""
-        mdl.submit()
+        self.page.modal.remove_all_required()
+        self.page.modal.description = ""
+        self.page.modal.submit()
         self.wait.until(animation_is_finished())
-        self.assertIn("This field is required.", mdl.errors["Description"])
+        self.assertIn("This field is required.", self.page.modal.errors["Description"])
         # Now do it properly
-        new_desc = "A BIG hammer"
-        mdl.description = new_desc
-        mdl.submit()
+        self.page.modal.description = new_desc = "A BIG hammer"
+        self.page.modal.submit()
         submit_time = timezone.now()
         self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
         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=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,18 +321,17 @@ 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.page.modal.close()
         self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
         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)
         self.assertEqual(None, audited.last_audited_by)
 
+    def test_audit_search(self):
         # Check that a failed search works
         self.page.set_query("NOTFOUND")
         self.page.search()
@@ -383,30 +380,31 @@ class Test404(TestCase):
             self.assertEqual(response.status_code, 404)
 
 
+# TODO refactor this for all of RIGS
 class TestAccessLevels(TestCase):
     @override_settings(DEBUG=True)
     def setUp(self):
         super().setUp()
         # Shortcut to create the levels - bonus side effect of testing the command (hopefully) matches production
         call_command('generateSampleData')
+        # Create an asset with ID 1 to make things easier in loops (we can always use pk=1)
+        self.category = models.AssetCategory.objects.create(name="Number One")
+        self.status = models.AssetStatus.objects.create(name="Probably Fine", should_show=True)
+        models.Asset.objects.create(asset_id="1", description="Half Price Fish", status=self.status, category=self.category, date_acquired=datetime.date(2020, 2, 1))
 
     # Nothing should be available to the unauthenticated
     def test_unauthenticated(self):
-        for url in urls.urlpatterns:
-            if url.name is not None:
-                pattern = str(url.pattern)
-                if "json" in url.name or pattern:
-                    # TODO
-                    pass
-                elif ":pk>" in pattern:
-                    request_url = reverse(url.name, kwargs={'pk': 9})
-                else:
-                    request_url = reverse(url.name)
-                response = self.client.get(request_url, HTTP_HOST='example.com')
-                self.assertEqual(response.status_code, 302)
+        self.client.logout()
+        for url in filter(lambda url: url.name is not None and "json" not in str(url), urls.urlpatterns):
+            pattern = str(url.pattern)
+            request_url = ""
+            if ":pk>" in pattern:
+                request_url = reverse(url.name, kwargs={'pk': 1})
+            else:
+                request_url = reverse(url.name)
+            if request_url:
                 response = self.client.get(request_url, follow=True, HTTP_HOST='example.com')
-                self.assertEqual(response.status_code, 200)
-                self.assertContains(response, 'login')
+                self.assertContains(response, 'Login')
 
     def test_basic_access(self):
         self.assertTrue(self.client.login(username="basic", password="basic"))
@@ -452,6 +450,19 @@ class TestAccessLevels(TestCase):
 
     # def test_finance_access(self): Level not used in assets currently
 
+    def test_page_titles(self):
+        self.assertTrue(self.client.login(username="superuser", password="superuser"))
+        for url in filter(lambda url: url.name is not None and not any(s in url.name for s in ["json", "embed"]), urls.urlpatterns):
+            request_url = ""
+            if ":pk>" in str(url.pattern):
+                request_url = reverse(url.name, kwargs={'pk': "1"})
+            else:
+                request_url = reverse(url.name)
+            response = self.client.get(request_url)
+            if hasattr(response, "context_data") and "page_title" in response.context_data:
+                expected_title = response.context_data["page_title"]
+                self.assertContains(response, '<title>{} | Rig Information Gathering System</title>'.format(expected_title))
+
 
 class TestFormValidation(TestCase):
     @classmethod

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()