diff --git a/.travis.yml b/.travis.yml index 8477299..117f6f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,3 +25,4 @@ script: - python -m pytest -v --ignore data -k integration # Federation tests (with two local instances) - python -m pytest -v -s --ignore data -k federation + - docker logs instance1_web_1 diff --git a/app.py b/app.py index f305fa2..559ded3 100644 --- a/app.py +++ b/app.py @@ -69,7 +69,7 @@ app.secret_key = get_secret_key('flask') app.config.update( WTF_CSRF_CHECK_DEFAULT=False, ) -csrf = CSRFProtect(app) +# csrf = CSRFProtect(app) logger = logging.getLogger(__name__) @@ -668,7 +668,7 @@ def api_user_key(): def _user_api_get_note(): - if request.is_json(): + if request.is_json: oid = request.json.get('id') else: oid = request.args.get('id') or request.form.get('id')