Yet more test shenanigans

Can you tell I'm getting fed up?

assets/tests/conftest.py

@@ -5,22 +5,31 @@ import datetime
 
 @pytest.fixture
 def category(db):
-    return models.AssetCategory.objects.create(name="Sound")
+    category = models.AssetCategory.objects.create(name="Sound")
+    yield category
+    category.delete()
 
 
 @pytest.fixture
 def status(db):
-    return models.AssetStatus.objects.create(name="Broken", should_show=True)
+    status = models.AssetStatus.objects.create(name="Broken", should_show=True)
+    yield status
+    status.delete()
 
 
 @pytest.fixture
 def test_cable(db, category, status):
     connector = models.Connector.objects.create(description="16A IEC", current_rating=16, voltage_rating=240, num_pins=3)
     cable_type = models.CableType.objects.create(circuits=11, cores=3, plug=connector, socket=connector)
-    return models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5")
+    cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5")
+    yield cable
+    connector.delete()
+    cable_type.delete()
+    cable.delete()
 
 
 @pytest.fixture
 def test_asset(db, category, status):
     asset = models.Asset.objects.create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26))
-    return asset
+    yield asset
+    asset.delete()

assets/tests/test_access.py

@@ -1,71 +0,0 @@
-import datetime
-
-import pytest
-from django.core.management import call_command
-from django.test import override_settings
-from django.test.utils import override_settings
-from django.urls import reverse
-from pytest_django.asserts import assertFormError, assertRedirects, assertContains, assertNotContains
-
-from PyRIGS.tests.base import assert_oembed, login
-
-from assets import models
-
-from django.utils import timezone
-
-
-@pytest.fixture(scope='class', autouse=True)
-def run_sample_data(django_db_blocker):  # We need stuff setup so we don't get 404 errors everywhere
-    with django_db_blocker.unblock():
-        from django.conf import settings
-        settings.DEBUG = True
-        call_command('generateSampleUserData')
-        call_command('generateSampleAssetsData')
-        settings.DEBUG = False
-
-
-class TestAccess():
-    def test_basic_access(client):
-        client.logout()
-        assert client.login(username="basic", password="basic")
-
-        url = reverse('asset_list')
-        response = client.get(url)
-        # Check edit and duplicate buttons NOT shown in list
-        assertNotContains(response, 'Edit')
-        assertNotContains(response, 'Duplicate')  # If this line is randomly failing, check the debug toolbar HTML hasn't crept in
-
-        url = reverse('asset_detail', kwargs={'pk': 1})
-        response = client.get(url)
-        assertNotContains(response, 'Purchase Details')
-        assertNotContains(response, 'View Revision History')
-
-        urls = {'asset_history', 'asset_update', 'asset_duplicate'}
-        for url_name in urls:
-            request_url = reverse(url_name, kwargs={'pk': 1})
-            response = client.get(request_url, follow=True)
-            assert response.status_code == 403
-
-        request_url = reverse('supplier_create')
-        response = client.get(request_url, follow=True)
-        assert response.status_code == 403
-
-        request_url = reverse('supplier_update', kwargs={'pk': 1})
-        response = client.get(request_url, follow=True)
-        assert response.status_code == 403
-
-
-    def test_keyholder_access(client):
-        client.logout()
-        assert client.login(username="keyholder", password="keyholder")
-
-        url = reverse('asset_list')
-        response = client.get(url)
-        # Check edit and duplicate buttons shown in list
-        assertContains(response, 'Edit')
-        assertContains(response, 'Duplicate')
-
-        url = reverse('asset_detail', kwargs={'pk': 1})
-        response = client.get(url)
-        assertContains(response, 'Purchase Details')
-        assertContains(response, 'View Revision History')

assets/tests/test_interaction.py

@@ -313,6 +313,7 @@ class TestAssetAudit(AutoLoginTest):
         # Now do it properly
         self.page.modal.description = new_desc = "A BIG hammer"
         self.page.modal.submit()
+        self.driver.implicitly_wait(4)
         self.wait.until(animation_is_finished())
         submit_time = timezone.now()
         # Check data is correct

assets/tests/test_unit.py

@@ -1,7 +1,6 @@
 import datetime
 
 import pytest
-from django.core.management import call_command
 from django.urls import reverse
 from pytest_django.asserts import assertFormError, assertRedirects, assertContains, assertNotContains
 
@@ -130,23 +129,3 @@ def assert_asset_form_errors(response):
     assertFormError(response, 'form', 'date_sold', 'Cannot sell an item before it is acquired')
     assertFormError(response, 'form', 'purchase_price', 'A price cannot be negative')
     assertFormError(response, 'form', 'salvage_value', 'A price cannot be negative')
-
-
-def test_production_exception(client):
-    from django.core.management.base import CommandError
-
-    with pytest.raises(CommandError, match=".*production"):
-        call_command('generateSampleAssetsData')
-        call_command('deleteSampleData')
-
-
-@pytest.mark.django_db(transaction=True)
-def test_generate_sample_data(settings):
-    settings.DEBUG = True
-    print(models.AssetCategory.objects.all())
-    # Run the management command and check there are no exceptions
-    call_command('generateSampleAssetsData')
-
-    # Check there are lots
-    assert models.Asset.objects.all().count() > 50
-    assert models.Supplier.objects.all().count() > 50