Merge pull request #48 from mekanix/feature/fix-models

Fix tests

Author: mekanix

bin/test.sh

@@ -6,6 +6,7 @@ set -e
 export BIN_DIR=`dirname $0`
 export PROJECT_ROOT="${BIN_DIR}/.."
 export FLASK_ENV="testing"
+export DBTYPE="all"
 
 . ${BIN_DIR}/common.sh
 setup
@@ -26,4 +27,9 @@ cd "${PROJECT_ROOT}"
 rm -rf `find . -name __pycache__`
 rm -rf .pytest_cache
 flake8 .
+
+export DBTYPE="sql"
 py.test --ignore=freenit/project/ --cov=freenit --cov-report=term-missing:skip-covered --cov-report=xml
+
+# export DBTYPE="mongo"
+# py.test --ignore=freenit/project/ --cov=freenit --cov-report=term-missing:skip-covered --cov-report=xml

common_config.py

@@ -22,7 +22,7 @@ class Config:
     OPENAPI_REDOC_PATH = '/redoc'
     OPENAPI_SWAGGER_UI_PATH = '/swaggerui'
     OPENAPI_SWAGGER_UI_URL = '/static/swaggerui/'
-    OPENAPI_VERSION = '2.0.0'
+    OPENAPI_VERSION = '3.0.3'
     MEDIA_URL = '/media'
     MEDIA_PATH = 'media'
     ACCOUNT_REQUEST_EXPIRY = 24  # in hours

freenit/models/mongo/__init__.py

@@ -6,12 +6,15 @@
 
 PROJECT_ROOT = pathlib.Path(__file__).parent
 README = (PROJECT_ROOT / 'README.md').read_text()
-sql = ['peewee-migrate>=1.1.6']
+sql = [
+    'peewee',
+    'peewee-migrate>=1.1.6',
+]
 mongo = ['flask-mongoengine']
 
 setup(
     name='freenit',
-    version='0.1.0',
+    version='0.1.1',
     description='REST API framework based on Flask-Smorest',
     long_description=README,
     long_description_content_type='text/markdown',

freenit/models/sql/__init__.py

@@ -1,12 +1,12 @@
 import os
 
-import pytest
-from pytest_factoryboy import register
-
-from config import configs
 from freenit import create_app
 from peewee_migrate import Router
 from peewee_migrate.router import DEFAULT_MIGRATE_DIR
+from pytest_factoryboy import register
+
+import pytest
+from config import configs
 
 from .factories import AdminFactory, RoleFactory, UserFactory
 
@@ -17,21 +17,17 @@
 
 @pytest.fixture
 def app():
+    dbtype = os.environ['DBTYPE']
     config = configs['testing']
-    flask_app = create_app(config)
-    router = Router(
-        flask_app.db.database,
-        migrate_dir=f'{DEFAULT_MIGRATE_DIR}/main',
-    )
-    #  log_router = Router(
-    #      flask_app.logdb.database,
-    #      migrate_dir=f'{DEFAULT_MIGRATE_DIR}/logs',
-    #  )
-    router.run()
-    #  log_router.run()
+    flask_app = create_app(config, dbtype=dbtype)
+    if dbtype == 'sql':
+        router = Router(
+            flask_app.db.database,
+            migrate_dir=f'{DEFAULT_MIGRATE_DIR}/main',
+        )
+        router.run()
     yield flask_app
-    flask_app.db.close_db('')
-    #  flask_app.logdb.close_db('')
-    current_path = os.path.dirname(__file__)
-    os.remove('{}/../test.db'.format(current_path))
-    #  os.remove('{}/../log_test.db'.format(current_path))
+    if dbtype == 'sql':
+        flask_app.db.close_db('')
+        current_path = os.path.dirname(__file__)
+        os.remove('{}/../test.db'.format(current_path))