* Updated tests to pytest

* Added tests for coverage
* Made small adjustments to helper and utilitiy functions for clarity

Author: jakeymac

tests/unit_tests/test_tethys_quotas/test_admin.py

@@ -56,11 +56,33 @@ def test_admin_tethys_app_quotas_inline_active_impose_default(
     arq = ResourceQuota.objects.get(applies_to="tethys_apps.models.TethysApp")
     arq.active = True
     arq.impose_default = True
+    arq.default = 37.6
     arq.save()
     app = TethysApp.objects.get(package="test_app")
     response = admin_client.get(f"/admin/tethys_apps/tethysapp/{app.id}/change/")
     assert response.status_code == 200
     assert b"Tethys App Quotas" in response.content
+    assert b"<p>37.6</p>" in response.content
+    assert TethysAppQuota.objects.count() == 1
+    arq.active = False
+    arq.impose_default = False
+    arq.save()
+
+
+@pytest.mark.django_db
+def test_admin_tethys_app_quotas_inline_active_no_default(admin_client, load_quotas):
+    assert ResourceQuota.objects.count() == 2
+    app = TethysApp.objects.get(package="test_app")
+    arq = ResourceQuota.objects.get(applies_to="tethys_apps.models.TethysApp")
+    arq.active = True
+    arq.impose_default = False
+    TethysAppQuota.objects.create(resource_quota=arq, entity=app, value=None)
+    arq.save()
+
+    response = admin_client.get(f"/admin/tethys_apps/tethysapp/{app.id}/change/")
+    assert response.status_code == 200
+    assert b"Tethys App Quotas" in response.content
+    assert b"<p>--</p>" in response.content
     assert TethysAppQuota.objects.count() == 1
     arq.active = False
     arq.impose_default = False
@@ -76,7 +98,7 @@ def test_admin_user_quotas_inline_inactive(admin_client, admin_user, load_quotas
     response = admin_client.get(f"/admin/auth/user/{admin_user.id}/change/")
     assert response.status_code == 200
     assert b"User Quotas" in response.content
-    assert UserQuota.objects.count() == 1
+    assert UserQuota.objects.count() == 0
 
 
 @pytest.mark.django_db
@@ -101,16 +123,35 @@ def test_admin_user_quotas_inline_active_impose_default(
     urq = ResourceQuota.objects.get(applies_to="django.contrib.auth.models.User")
     urq.active = True
     urq.impose_default = True
+    urq.default = 29.5
     urq.save()
     response = admin_client.get(f"/admin/auth/user/{admin_user.id}/change/")
     assert response.status_code == 200
     assert b"User Quotas" in response.content
+    assert b"<p>29.5</p>" in response.content
     assert UserQuota.objects.count() == 1
     urq.active = False
     urq.impose_default = False
     urq.save()
 
 
+@pytest.mark.django_db
+def test_admin_user_quotas_inline_no_default(admin_client, admin_user, load_quotas):
+    assert ResourceQuota.objects.count() == 2
+    urq = ResourceQuota.objects.get(applies_to="django.contrib.auth.models.User")
+    UserQuota.objects.create(resource_quota=urq, entity=admin_user, value=None)
+    urq.active = True
+    urq.impose_default = False
+    urq.save()
+    response = admin_client.get(f"/admin/auth/user/{admin_user.id}/change/")
+    assert response.status_code == 200
+    assert b"User Quotas" in response.content
+    assert b"<p>--</p>" in response.content
+    urq.active = False
+    urq.impose_default = True
+    urq.save()
+
+
 @pytest.mark.django_db
 def test_admin_user_quotas_inline_add_user(admin_client, load_quotas):
     assert ResourceQuota.objects.count() == 2

tests/unit_tests/test_tethys_quotas/test_enforce_quota.py

@@ -59,6 +59,21 @@ def test_enforce_quota_rq_does_not_exist(mock_RQ, mock_log):
     assert "Success" == ret
 
 
+@mock.patch("tethys_quotas.decorators.log")
+@mock.patch("tethys_quotas.decorators.get_active_app")
+@mock.patch("tethys_quotas.decorators.ResourceQuota")
+def test_enforce_quota_no_app_request(mock_RQ, mock_active_app, mock_log):
+    mock_RQ.objects.get.return_value = mock.MagicMock(
+        codename="foo", applies_to="tethys_apps.models.TethysApp"
+    )
+    mock_active_app.return_value = None
+
+    mock_request = mock.MagicMock(spec=HttpRequest)
+    a_controller(mock_request)
+
+    mock_log.warning.assert_called_with("Request could not be used to find app")
+
+
 @mock.patch("tethys_quotas.decorators.log")
 def test_enforce_quota_no_HttpRequest(mock_log):
     mock_request = mock.MagicMock()