fix all the tests to use bootstrap or do right number of orm starts

hjwp · hjwp · commit e19848fa825a · 2020-01-03T23:51:43.000Z
diff --git a/tests/integration/test_email.py b/tests/integration/test_email.py
@@ -2,26 +2,24 @@
 import uuid
 import pytest
 import requests
-from allocation import config
+
+from allocation import bootstrap, config
 from allocation.domain import commands
 from allocation.adapters import notifications
-from allocation.service_layer import messagebus, unit_of_work
 
 cfg = config.get_email_host_and_port()
 
 @pytest.fixture
 def bus(sqlite_session_factory):
-    uow = unit_of_work.SqlAlchemyUnitOfWork(sqlite_session_factory)
-    bus = messagebus.MessageBus(
-        uow=uow,
+    return bootstrap.bootstrap(
+        start_orm=lambda: None,
+        session_factory=sqlite_session_factory,
         notifications=notifications.EmailNotifications(
             smtp_host=cfg['host'],
             port=cfg['port'],
         ),
         publish=lambda *_, **__: None
     )
-    uow.bus = bus
-    return bus
 
 
 def random_sku():
diff --git a/tests/integration/test_repository.py b/tests/integration/test_repository.py
@@ -1,6 +1,7 @@
 from allocation.adapters import repository
 from allocation.domain import model
 
+
 def test_get_by_batchref(sqlite_session_factory):
     session = sqlite_session_factory()
     repo = repository.SqlAlchemyRepository(session)
diff --git a/tests/integration/test_views.py b/tests/integration/test_views.py
@@ -1,22 +1,23 @@
 # pylint: disable=redefined-outer-name
 from datetime import date
 from unittest import mock
+from sqlalchemy.orm import clear_mappers
 import pytest
-from allocation import views
+
+from allocation import bootstrap, views
 from allocation.domain import commands
-from allocation.service_layer import messagebus, unit_of_work
 
 
 @pytest.fixture
 def sqlite_bus(sqlite_session_factory):
-    uow = unit_of_work.SqlAlchemyUnitOfWork(sqlite_session_factory)
-    bus = messagebus.MessageBus(
-        uow=uow,
+    bus = bootstrap.bootstrap(
+        start_orm=lambda: None,
+        session_factory=sqlite_session_factory,
         notifications=mock.Mock(),
         publish=mock.Mock(),
     )
-    uow.bus = bus
-    return bus
+    yield bus
+    clear_mappers()
 
 
 def test_allocations_view(sqlite_bus):
