Fix database init

test/test_database.py

@@ -5,18 +5,16 @@ from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 from flask_security import SQLAlchemySessionUserDatastore
 from models import User, Role, Application
+from database import init_db
 
 class DatabaseSetupTest(unittest.TestCase):
 
     def setUp(self):
         # Setup local database for testing
-        self.engine = create_engine('sqlite:///:memory:')
+        self.engine = create_engine('sqlite://')
+        init_db(self.engine)
         session_factory = sessionmaker(bind=self.engine)
         Session = scoped_session(session_factory)
-        import models
-        base = declarative_base()
-        base.query = Session.query_property()
-        base.metadata.create_all(self.engine)
         self.new_session = Session()
         self.user_datastore = SQLAlchemySessionUserDatastore(
             self.new_session, User, Role)