update tests for Flask

tests/domain/test_pe_numbers.py

@@ -6,36 +6,32 @@ from atst.domain.pe_numbers import PENumbers
 from tests.factories import PENumberFactory
 
 
-@pytest.fixture()
-def pe_numbers(db):
-    return PENumbers(db)
-
 @pytest.fixture(scope="function")
-def new_pe_number(db):
+def new_pe_number(session):
     def make_pe_number(**kwargs):
         pen = PENumberFactory.create(**kwargs)
-        db.add(pen)
-        db.commit()
+        session.add(pen)
+        session.commit()
 
         return pen
 
     return make_pe_number
 
 
-def test_can_get_pe_number(pe_numbers, new_pe_number):
+def test_can_get_pe_number(new_pe_number):
     new_pen = new_pe_number(number="0701367F", description="Combat Support - Offensive")
-    pen = pe_numbers.get(new_pen.number)
+    pen = PENumbers.get(new_pen.number)
 
     assert pen.number == new_pen.number
 
 
-def test_nonexistent_pe_number_raises(pe_numbers):
+def test_nonexistent_pe_number_raises():
     with pytest.raises(NotFoundError):
-        pe_numbers.get("some fake number")
+        PENumbers.get("some fake number")
 
-def test_create_many(pe_numbers):
+def test_create_many():
     pen_list = [['123456', 'Land Speeder'], ['7891011', 'Lightsaber']]
-    pe_numbers.create_many(pen_list)
+    PENumbers.create_many(pen_list)
 
-    assert pe_numbers.get(pen_list[0][0])
-    assert pe_numbers.get(pen_list[1][0])
+    assert PENumbers.get(pen_list[0][0])
+    assert PENumbers.get(pen_list[1][0])

tests/domain/test_requests.py

@@ -8,14 +8,14 @@ from tests.factories import RequestFactory
 
 
 @pytest.fixture()
-def requests(db):
-    return Requests(db)
+def requests(session):
+    return Requests()
 
 @pytest.fixture(scope="function")
-def new_request(db):
+def new_request(session):
     created_request = RequestFactory.create()
-    db.add(created_request)
-    db.commit()
+    session.add(created_request)
+    session.commit()
 
     return created_request
 
@@ -31,25 +31,22 @@ def test_nonexistent_request_raises(requests):
         requests.get(uuid4())
 
 
-@pytest.mark.gen_test
 def test_auto_approve_less_than_1m(requests, new_request):
     new_request.body = {"details_of_use": {"dollar_value": 999999}}
-    request = yield requests.submit(new_request)
+    request = requests.submit(new_request)
 
     assert request.status == 'approved'
 
 
-@pytest.mark.gen_test
 def test_dont_auto_approve_if_dollar_value_is_1m_or_above(requests, new_request):
     new_request.body = {"details_of_use": {"dollar_value": 1000000}}
-    request = yield requests.submit(new_request)
+    request = requests.submit(new_request)
 
     assert request.status == 'submitted'
 
 
-@pytest.mark.gen_test
 def test_dont_auto_approve_if_no_dollar_value_specified(requests, new_request):
     new_request.body = {"details_of_use": {}}
-    request = yield requests.submit(new_request)
+    request = requests.submit(new_request)
 
     assert request.status == 'submitted'

tests/domain/test_roles.py

@@ -4,8 +4,8 @@ from atst.domain.exceptions import NotFoundError
 
 
 @pytest.fixture()
-def roles_repo(db):
-    return Roles(db)
+def roles_repo(session):
+    return Roles(session)
 
 
 def test_get_all_roles(roles_repo):

tests/domain/test_task_orders.py

@@ -7,15 +7,15 @@ from tests.factories import TaskOrderFactory
 
 
 @pytest.fixture()
-def task_orders(db):
-    return TaskOrders(db)
+def task_orders(session):
+    return TaskOrders(session)
 
 @pytest.fixture(scope="function")
-def new_task_order(db):
+def new_task_order(session):
     def make_task_order(**kwargs):
         to = TaskOrderFactory.create(**kwargs)
-        db.add(to)
-        db.commit()
+        session.add(to)
+        session.commit()
 
         return to
 

tests/domain/test_users.py

@@ -6,8 +6,8 @@ from atst.domain.exceptions import NotFoundError, AlreadyExistsError
 
 
 @pytest.fixture()
-def users_repo(db):
-    return Users(db)
+def users_repo(session):
+    return Users(session)
 
 
 @pytest.fixture(scope="function")

tests/domain/test_workspace_users.py

@@ -6,13 +6,13 @@ from atst.domain.users import Users
 
 
 @pytest.fixture()
-def users_repo(db):
-    return Users(db)
+def users_repo(session):
+    return Users(session)
 
 
 @pytest.fixture()
-def workspace_users_repo(db):
-    return WorkspaceUsers(db)
+def workspace_users_repo(session):
+    return WorkspaceUsers(session)
 
 
 def test_can_create_new_workspace_user(users_repo, workspace_users_repo):