Update format of test data dumps and fix tests

test/conftest.py

@@ -28,18 +28,19 @@ def dummy_config():
     }
 
 
+@pytest.fixture
 def nren_services():
-    with _test_data('service-matrix-services.json', as_csv=False) as f:
-        services = json.load(f)
-        for name_key, record in services.items():
-            service = presentation_models.Service(
-                name_key=name_key,
-                name=record['name'],
-                category=record['category'],
-                description=record['description'],
-            )
-            db.session.merge(service)
-        db.session.commit()
+    def load_services(app):
+        with app.app_context():
+            with _test_data('presentation_models_data/Service.json', as_csv=False) as f:
+                services = json.load(f)
+                for row in services:
+                    service = presentation_models.Service(
+                        **row
+                    )
+                    db.session.merge(service)
+                db.session.commit()
+    yield load_services
 
 
 @pytest.fixture
@@ -128,7 +129,6 @@ def app(dummy_config):
 
     with app.app_context():
         db.create_all(bind_key=None)
-        nren_services()
     yield app
 
 
@@ -138,7 +138,6 @@ def app_with_survey_db(dummy_config):
     app = compendium_v2._create_app_with_db(dummy_config)
     with app.app_context():
         db.create_all()
-        nren_services()
     yield app