horizon

Author: NickSchimek

.github/workflows/pytest.yml

@@ -47,6 +47,9 @@ jobs:
       - name: Create db
         run: createdb dwellingly_test
 
+      - name: Seed Test
+        run: pipenv run flask db minimal_seed
+
       - name: Test
         run: |
           pipenv run pytest

conftest.py

@@ -70,13 +70,9 @@ def _pm_header(pm=None):
 
 
 @pytest.fixture(autouse=True)
-def reset_db():
+def app_context(app):
     Seed().destroy_all()
 
-@pytest.fixture(autouse=True)
-def empty_test_db(app):
-    pass
-
 # -------------     NON-FIXTURE FUNCTIONS     --------------------
 def has_valid_headers(response):
     if response.content_type != "application/json":

data/seed.py

@@ -292,18 +292,18 @@ def create_property_manager(self, payload):
     def destroy_all(self):
         db.session.execute(
             """
-do
+DO
 $$
-declare
-  l_stmt text;
-begin
-  select 'truncate ' || string_agg(format('%I.%I', schemaname, tablename), ',')
-    into l_stmt
-  from pg_tables
-  where schemaname in ('public');
-
-  execute l_stmt;
-end;
+DECLARE
+    stmt text;
+BEGIN
+    SELECT 'TRUNCATE ' || string_agg(format('%I.%I', schemaname, tablename), ',') || ' CASCADE'
+        INTO stmt
+    FROM pg_tables
+    WHERE schemaname in ('public');
+
+    EXECUTE stmt;
+END;
 $$
-        """
+            """
         )

tests/authorizations/test_emergency_contact_authorization.py

@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestEmergenyContactsAuthorizations:
     def setup(self):
         self.endpoint = "/api/emergencycontacts"

tests/authorizations/test_lease_authorization.py

@@ -2,7 +2,7 @@
 import pytest
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestLeaseAuthorizations:
     def valid_payload(self, tenant, lease):
         return {"tenantID": tenant.id, **lease}

tests/authorizations/test_property_authorization.py

@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestPropertyAuthorizations:
     def test_post_property(self, property_attributes):
         property_attrs = property_attributes()

tests/authorizations/test_staff_tenant_authorization.py

@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestStaffTenantAuthorizations:
     def setup(self):
         self.endpoint = "/api/staff-tenants"

tests/authorizations/test_tenant_authorization.py

@@ -2,7 +2,7 @@
 from conftest import is_valid
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestTenantAuthorization:
     def setup(self):
         self.endpoint = "/api/tenants"

tests/authorizations/test_ticket_authorization.py

@@ -2,7 +2,7 @@
 from conftest import is_valid
 
 
-@pytest.mark.usefixtures("empty_test_db", "client_class")
+@pytest.mark.usefixtures("client_class")
 class TestTicketAuthorization:
     def setup(self):
         self.endpoint = "/api/tickets"

tests/authorizations/test_user_authentication.py

@@ -4,7 +4,7 @@
 from flask_jwt_extended import create_access_token, create_refresh_token
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestUserAuthorization:
     def test_user_auth(self, create_admin_user):
         password = "strongestpasswordever"
@@ -63,7 +63,7 @@ def test_get_user(self, pm_header):
         assert is_valid(unauthorized_user_response, 401)
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestUserDeleteAuthorization:
     def test_admin_is_authorized(self, admin_header, create_user):
         response = self.client.delete(
@@ -84,7 +84,7 @@ def test_pm_is_not_authorized(self, pm_header, create_user):
         assert response.status_code == 401
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestUserPatchAuthorization:
     def test_auth_token_is_required(self):
         response = self.client.patch("api/user/5", json={})
@@ -127,7 +127,7 @@ def test_pm_is_authorized_to_update_themselves(
         assert response == 200
 
 
-@pytest.mark.usefixtures("client_class", "empty_test_db")
+@pytest.mark.usefixtures("client_class")
 class TestUserLogic:
     # TODO: This doesn't belong in auth tests
     def test_password(self, header, create_user, faker):