From a398b49a98ba0b9157fd351adbe6c200dd627d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Y=C3=BBki=20Vachot?= Date: Fri, 14 Jan 2022 01:27:18 +0100 Subject: [PATCH] Cors + Tests --- backend/application/__init__.py | 5 ----- backend/application/routes.py | 2 +- backend/requirements.txt | 3 ++- backend/test.py | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/backend/application/__init__.py b/backend/application/__init__.py index 9e7b2bb..af2f4ce 100644 --- a/backend/application/__init__.py +++ b/backend/application/__init__.py @@ -1,7 +1,6 @@ from flask import Flask from flask_sqlalchemy import SQLAlchemy import sys -import os db = SQLAlchemy() @@ -23,13 +22,9 @@ def create_app(flask_env='development'): else: print('ENV Variables passed : ', app.config['SQLALCHEMY_BINDS']) - print('init_app') db.init_app(app) with app.app_context(): - #print('import routes') from . import routes app.register_blueprint(routes.bp) - #print('db.create_all') db.create_all() - #print('db created') return app diff --git a/backend/application/routes.py b/backend/application/routes.py index 7283e0c..661623c 100644 --- a/backend/application/routes.py +++ b/backend/application/routes.py @@ -32,7 +32,7 @@ def login(): elif res['status'] == 1: user = None token = create_auth_token(user) - return send_error(404, res['message'], token) + return send_error(400, res['message'], token) else: return send_error(400, 'Empty email and/or password fields.') except KeyError as e: diff --git a/backend/requirements.txt b/backend/requirements.txt index 4f7540a..6317cbe 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -9,4 +9,5 @@ pipreqs==0.4.10 PyJWT==2.3.0 pytest==6.2.5 SQLAlchemy==1.4.27 -psycopg2==2.9.2 \ No newline at end of file +psycopg2==2.9.2 +Flask-Cors==3.0.10 \ No newline at end of file diff --git a/backend/test.py b/backend/test.py index 10382ea..2aa595f 100644 --- a/backend/test.py +++ b/backend/test.py @@ -66,7 +66,7 @@ class FlaskTestCase(BaseTestCase): "password": "nimp" } response = self.client.post('/api/login', json=data0) - self.assertEqual(response.status_code, 404) + self.assertEqual(response.status_code, 400) def test_login_wrongFields_message(self): data0 = { @@ -492,7 +492,7 @@ class FlaskTestCase(BaseTestCase): def test_adminDelete_noFields_statusCode(self): response = self.login('daisy@gmail.com', 'daisyPass') self.assertEqual(response.status_code, 200) - response = self.client.delete('/api/admin/delete/user') + response = self.client.delete('/api/admin/delete/user/') self.assertEqual(response.status_code, 404) def test_adminDelete_no_fields(self):