From e055590b0730acb810cba034456c5306671b195d Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 11 Mar 2016 12:39:55 +0000 Subject: [PATCH] Changed db queries to use one, which throws NoResultFound exception, this exception is dealt with in our error handlers. Now a lot of the if none checks can be removed. --- app/dao/jobs_dao.py | 2 +- app/dao/services_dao.py | 2 +- app/dao/templates_dao.py | 2 +- app/dao/users_dao.py | 4 ++-- app/errors.py | 6 ++--- app/job/rest.py | 9 ++------ app/notifications/rest.py | 16 +++---------- app/service/rest.py | 21 +++++++++-------- app/template/rest.py | 13 +++-------- app/user/rest.py | 34 +++------------------------- tests/app/dao/test_services_dao.py | 6 +++-- tests/app/dao/test_templates_dao.py | 4 +++- tests/app/dao/test_users_dao.py | 4 +++- tests/app/job/test_rest.py | 4 ++-- tests/app/notifications/test_rest.py | 22 ++++++++---------- tests/app/service/test_rest.py | 8 +++---- tests/app/template/test_rest.py | 11 +++++---- tests/app/user/test_rest.py | 6 ++--- tests/app/user/test_rest_verify.py | 4 ++-- 19 files changed, 66 insertions(+), 112 deletions(-) diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py index 38b8466e2..c43d82b79 100644 --- a/app/dao/jobs_dao.py +++ b/app/dao/jobs_dao.py @@ -3,7 +3,7 @@ from app.models import Job def dao_get_job_by_service_id_and_job_id(service_id, job_id): - return Job.query.filter_by(service_id=service_id, id=job_id).first() + return Job.query.filter_by(service_id=service_id, id=job_id).one() def dao_get_jobs_by_service_id(service_id): diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index ce392be6e..74f533b4c 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -8,7 +8,7 @@ def dao_fetch_all_services(): def dao_fetch_service_by_id(service_id): - return Service.query.filter_by(id=service_id).first() + return Service.query.filter_by(id=service_id).one() def dao_fetch_all_services_by_user(user_id): diff --git a/app/dao/templates_dao.py b/app/dao/templates_dao.py index 2e854f24d..09390d175 100644 --- a/app/dao/templates_dao.py +++ b/app/dao/templates_dao.py @@ -14,7 +14,7 @@ def dao_update_template(template): def dao_get_template_by_id_and_service_id(template_id, service_id): - return Template.query.filter_by(id=template_id, service_id=service_id).first() + return Template.query.filter_by(id=template_id, service_id=service_id).one() def dao_get_template_by_id(template_id): diff --git a/app/dao/users_dao.py b/app/dao/users_dao.py index be05ed89d..c108b6211 100644 --- a/app/dao/users_dao.py +++ b/app/dao/users_dao.py @@ -69,12 +69,12 @@ def delete_model_user(user): def get_model_users(user_id=None): if user_id: - return User.query.filter_by(id=user_id).first() + return User.query.filter_by(id=user_id).one() return User.query.filter_by().all() def get_user_by_email(email): - return User.query.filter_by(email_address=email).first() + return User.query.filter_by(email_address=email).one() def increment_failed_login_count(user): diff --git a/app/errors.py b/app/errors.py index 465ed8acb..9d784fa89 100644 --- a/app/errors.py +++ b/app/errors.py @@ -48,15 +48,15 @@ def register_errors(blueprint): @blueprint.app_errorhandler(NoResultFound) def no_result_found(e): - current_app.logger.error(e) + current_app.logger.error(str(e)) return jsonify(result='error', message="No result found"), 404 @blueprint.app_errorhandler(DataError) def data_error(e): - current_app.logger.error(e) + current_app.logger.error(str(e)) return jsonify(result='error', message="No result found"), 404 @blueprint.app_errorhandler(SQLAlchemyError) def db_error(e): - current_app.logger.error(e) + current_app.logger.error(str(e)) return jsonify(result='error', message=str(e)), 500 diff --git a/app/job/rest.py b/app/job/rest.py index 923fccd14..c7d38e8ce 100644 --- a/app/job/rest.py +++ b/app/job/rest.py @@ -19,7 +19,7 @@ from app.schemas import job_schema from app.celery.tasks import process_job -job = Blueprint('job', __name__, url_prefix='/service//job') +job = Blueprint('job', __name__, url_prefix='/service//job') from app.errors import register_errors @@ -45,9 +45,7 @@ def get_jobs_by_service(service_id): @job.route('', methods=['POST']) def create_job(service_id): - service = dao_fetch_service_by_id(service_id) - if not service: - return jsonify(result="error", message="Service {} not found".format(service_id)), 404 + dao_fetch_service_by_id(service_id) data = request.get_json() data.update({ @@ -65,9 +63,6 @@ def create_job(service_id): @job.route('/', methods=['POST']) def update_job(service_id, job_id): fetched_job = dao_get_job_by_service_id_and_job_id(service_id, job_id) - if not fetched_job: - return jsonify(result="error", message="Job {} not found for service {}".format(job_id, service_id)), 404 - current_data = dict(job_schema.dump(fetched_job).data.items()) current_data.update(request.get_json()) diff --git a/app/notifications/rest.py b/app/notifications/rest.py index 1fc35fe8e..9014742c4 100644 --- a/app/notifications/rest.py +++ b/app/notifications/rest.py @@ -32,13 +32,10 @@ from app.errors import register_errors register_errors(notifications) -@notifications.route('/notifications/', methods=['GET']) +@notifications.route('/notifications/', methods=['GET']) def get_notifications(notification_id): - try: - notification = notifications_dao.get_notification(api_user['client'], notification_id) - return jsonify({'notification': notification_status_schema.dump(notification).data}), 200 - except NoResultFound: - return jsonify(result="error", message="not found"), 404 + notification = notifications_dao.get_notification(api_user['client'], notification_id) + return jsonify({'notification': notification_status_schema.dump(notification).data}), 200 @notifications.route('/notifications', methods=['GET']) @@ -152,13 +149,6 @@ def send_notification(notification_type): template_id=notification['template'], service_id=service_id ) - if not template: - return jsonify( - result="error", - message={ - 'template': ['Template {} not found for service {}'.format(notification['template'], service_id)] - } - ), 404 template_object = Template(template.__dict__, notification.get('personalisation', {})) if template_object.missing_data: diff --git a/app/service/rest.py b/app/service/rest.py index 43922ebdf..cf5c440b7 100644 --- a/app/service/rest.py +++ b/app/service/rest.py @@ -50,7 +50,7 @@ def get_services(): return jsonify(data=data) -@service.route('/', methods=['GET']) +@service.route('/', methods=['GET']) def get_service_by_id(service_id): user_id = request.args.get('user_id', None) if user_id: @@ -72,8 +72,9 @@ def create_service(): if not data.get('user_id', None): return jsonify(result="error", message={'user_id': ['Missing data for required field.']}), 400 - user = get_model_users(data['user_id']) - if not user: + try: + user = get_model_users(data['user_id']) + except NoResultFound: return jsonify(result="error", message={'user_id': ['not found']}), 400 data.pop('user_id', None) @@ -89,7 +90,7 @@ def create_service(): return jsonify(data=service_schema.dump(valid_service).data), 201 -@service.route('/', methods=['POST']) +@service.route('/', methods=['POST']) def update_service(service_id): fetched_service = dao_fetch_service_by_id(service_id) if not fetched_service: @@ -104,7 +105,7 @@ def update_service(service_id): return jsonify(data=service_schema.dump(fetched_service).data), 200 -@service.route('//api-key', methods=['POST']) +@service.route('//api-key', methods=['POST']) def renew_api_key(service_id=None): fetched_service = dao_fetch_service_by_id(service_id=service_id) if not fetched_service: @@ -120,7 +121,7 @@ def renew_api_key(service_id=None): return jsonify(data=unsigned_api_key), 201 -@service.route('//api-key/revoke/', methods=['POST']) +@service.route('//api-key/revoke/', methods=['POST']) def revoke_api_key(service_id, api_key_id): service_api_key = get_model_api_keys(service_id=service_id, id=api_key_id) @@ -128,8 +129,8 @@ def revoke_api_key(service_id, api_key_id): return jsonify(), 202 -@service.route('//api-keys', methods=['GET']) -@service.route('//api-keys/', methods=['GET']) +@service.route('//api-keys', methods=['GET']) +@service.route('//api-keys/', methods=['GET']) def get_api_keys(service_id, key_id=None): fetched_service = dao_fetch_service_by_id(service_id=service_id) if not fetched_service: @@ -145,7 +146,7 @@ def get_api_keys(service_id, key_id=None): return jsonify(apiKeys=api_key_schema.dump(api_keys, many=True).data), 200 -@service.route('//users', methods=['GET']) +@service.route('//users', methods=['GET']) def get_users_for_service(service_id): fetched = dao_fetch_service_by_id(service_id) if not fetched: @@ -158,7 +159,7 @@ def get_users_for_service(service_id): return jsonify(data=result.data) -@service.route('//users/', methods=['POST']) +@service.route('//users/', methods=['POST']) def add_user_to_service(service_id, user_id): service = dao_fetch_service_by_id(service_id) if not service: diff --git a/app/template/rest.py b/app/template/rest.py index 8da697667..5c5f6f271 100644 --- a/app/template/rest.py +++ b/app/template/rest.py @@ -18,7 +18,7 @@ from app.dao.services_dao import ( ) from app.schemas import template_schema -template = Blueprint('template', __name__, url_prefix='/service//template') +template = Blueprint('template', __name__, url_prefix='/service//template') from app.errors import register_errors @@ -28,8 +28,6 @@ register_errors(template) @template.route('', methods=['POST']) def create_template(service_id): fetched_service = dao_fetch_service_by_id(service_id=service_id) - if not fetched_service: - return jsonify(result="error", message="Service not found"), 404 new_template, errors = template_schema.load(request.get_json()) if errors: @@ -52,8 +50,6 @@ def create_template(service_id): @template.route('/', methods=['POST']) def update_template(service_id, template_id): fetched_template = dao_get_template_by_id_and_service_id(template_id=template_id, service_id=service_id) - if not fetched_template: - return jsonify(result="error", message="Template not found"), 404 current_data = dict(template_schema.dump(fetched_template).data.items()) current_data.update(request.get_json()) @@ -77,11 +73,8 @@ def get_all_templates_for_service(service_id): @template.route('/', methods=['GET']) def get_template_by_id_and_service_id(service_id, template_id): fetched_template = dao_get_template_by_id_and_service_id(template_id=template_id, service_id=service_id) - if fetched_template: - data, errors = template_schema.dump(fetched_template) - return jsonify(data=data) - else: - return jsonify(result="error", message="Template not found"), 404 + data, errors = template_schema.dump(fetched_template) + return jsonify(data=data) def _strip_html(content): diff --git a/app/user/rest.py b/app/user/rest.py index 8886429fd..a98cfa8ef 100644 --- a/app/user/rest.py +++ b/app/user/rest.py @@ -33,7 +33,7 @@ register_errors(user) @user.route('', methods=['POST']) def create_user(): - user, errors = user_schema.load(request.get_json()) + user_to_create, errors = user_schema.load(request.get_json()) req_json = request.get_json() # TODO password policy, what is valid password if not req_json.get('password', None): @@ -41,16 +41,13 @@ def create_user(): return jsonify(result="error", message=errors), 400 if errors: return jsonify(result="error", message=errors), 400 - save_model_user(user, pwd=req_json.get('password')) - return jsonify(data=user_schema.dump(user).data), 201 + save_model_user(user_to_create, pwd=req_json.get('password')) + return jsonify(data=user_schema.dump(user_to_create).data), 201 @user.route('/', methods=['PUT']) def update_user(user_id): user_to_update = get_model_users(user_id=user_id) - if not user_to_update: - return _user_not_found(user_id) - req_json = request.get_json() update_dct, errors = user_schema_load_json.load(req_json) pwd = req_json.get('password', None) @@ -116,10 +113,6 @@ def verify_user_code(user_id): @user.route('//sms-code', methods=['POST']) def send_user_sms_code(user_id): user_to_send_to = get_model_users(user_id=user_id) - - if not user_to_send_to: - return _user_not_found(user_id) - verify_code, errors = request_verify_code_schema.load(request.get_json()) if errors: return jsonify(result="error", message=errors), 400 @@ -139,9 +132,6 @@ def send_user_sms_code(user_id): @user.route('//email-code', methods=['POST']) def send_user_email_code(user_id): user_to_send_to = get_model_users(user_id=user_id) - if not user_to_send_to: - return _user_not_found(user_id) - verify_code, errors = request_verify_code_schema.load(request.get_json()) if errors: return jsonify(result="error", message=errors), 400 @@ -162,8 +152,6 @@ def send_user_email_code(user_id): @user.route('', methods=['GET']) def get_user(user_id=None): users = get_model_users(user_id=user_id) - if not users: - return jsonify(result="error", message="not found"), 404 result = user_schema.dump(users, many=True) if isinstance(users, list) else user_schema.dump(users) return jsonify(data=result.data) @@ -173,11 +161,7 @@ def set_permissions(user_id, service_id): # TODO fix security hole, how do we verify that the user # who is making this request has permission to make the request. user = get_model_users(user_id=user_id) - if not user: - _user_not_found(user_id) service = dao_fetch_service_by_id(service_id=service_id) - if not service: - abort(404, 'Service not found for id: {}'.format(service_id)) permissions, errors = permission_schema.load(request.get_json(), many=True) if errors: abort(400, errors) @@ -194,8 +178,6 @@ def get_by_email(): if not email: return jsonify(result="error", message="invalid request"), 400 fetched_user = get_user_by_email(email) - if not fetched_user: - return _user_not_found_for_email() result = user_schema.dump(fetched_user) return jsonify(data=result.data) @@ -208,8 +190,6 @@ def send_user_reset_password(): return jsonify(result="error", message=errors), 400 user_to_send_to = get_user_by_email(email['email']) - if not user_to_send_to: - return _user_not_found_for_email() reset_password_message = {'to': user_to_send_to.email_address, 'name': user_to_send_to.name, @@ -220,14 +200,6 @@ def send_user_reset_password(): return jsonify({}), 204 -def _user_not_found(user_id): - return abort(404, 'User not found for id: {}'.format(user_id)) - - -def _user_not_found_for_email(): - return abort(404, 'User not found for email address') - - def _create_reset_password_url(email): from utils.url_safe_token import generate_token import json diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 9438103d1..8ca09cdd0 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -11,7 +11,7 @@ from app.dao.services_dao import ( ) from app.dao.users_dao import save_model_user from app.models import Service, User -from sqlalchemy.orm.exc import FlushError +from sqlalchemy.orm.exc import FlushError, NoResultFound from sqlalchemy.exc import IntegrityError @@ -145,7 +145,9 @@ def test_get_all_user_services_should_return_empty_list_if_no_services_for_user( def test_get_service_by_id_returns_none_if_no_service(notify_db): - assert not dao_fetch_service_by_id(str(uuid.uuid4())) + with pytest.raises(NoResultFound) as e: + dao_fetch_service_by_id(str(uuid.uuid4())) + assert 'No row was found for one()' in str(e) def test_get_service_by_id_returns_service(service_factory): diff --git a/tests/app/dao/test_templates_dao.py b/tests/app/dao/test_templates_dao.py index 7fabefdea..6b712a642 100644 --- a/tests/app/dao/test_templates_dao.py +++ b/tests/app/dao/test_templates_dao.py @@ -155,4 +155,6 @@ def test_get_template_by_id_and_service(notify_db, notify_db_session, sample_ser def test_get_template_by_id_and_service_returns_none_if_no_template(sample_service): - assert not dao_get_template_by_id_and_service_id(template_id=999, service_id=sample_service.id) + with pytest.raises(NoResultFound) as e: + dao_get_template_by_id_and_service_id(template_id=999, service_id=sample_service.id) + assert 'No row was found for one' in str(e.value) diff --git a/tests/app/dao/test_users_dao.py b/tests/app/dao/test_users_dao.py index 7be1b2ef3..8f928a954 100644 --- a/tests/app/dao/test_users_dao.py +++ b/tests/app/dao/test_users_dao.py @@ -1,5 +1,7 @@ from datetime import datetime, timedelta from sqlalchemy.exc import DataError +from sqlalchemy.orm.exc import NoResultFound + from app import db import pytest @@ -55,7 +57,7 @@ def test_get_user_not_exists(notify_api, notify_db, notify_db_session): try: get_model_users(user_id="12345") pytest.fail("NoResultFound exception not thrown.") - except: + except NoResultFound as e: pass diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py index c3154b8e2..636abc401 100644 --- a/tests/app/job/test_rest.py +++ b/tests/app/job/test_rest.py @@ -68,7 +68,7 @@ def test_get_job_with_unknown_id_returns404(notify_api, sample_template): assert response.status_code == 404 resp_json = json.loads(response.get_data(as_text=True)) assert resp_json == { - 'message': 'Job {} not found for service {}'.format(random_id, service_id), + 'message': 'No result found', 'result': 'error' } @@ -182,7 +182,7 @@ def test_create_job_returns_404_if_missing_service(notify_api, sample_template, app.celery.tasks.process_job.apply_async.assert_not_called() assert resp_json['result'] == 'error' - assert resp_json['message'] == 'Service {} not found'.format(random_id) + assert resp_json['message'] == 'No result found' def test_get_update_job(notify_api, sample_job): diff --git a/tests/app/notifications/test_rest.py b/tests/app/notifications/test_rest.py index cdc7c1957..60cac20a0 100644 --- a/tests/app/notifications/test_rest.py +++ b/tests/app/notifications/test_rest.py @@ -45,7 +45,7 @@ def test_get_notifications_empty_result(notify_api, sample_api_key): notification = json.loads(response.get_data(as_text=True)) assert notification['result'] == "error" - assert notification['message'] == "not found" + assert notification['message'] == "No result found" assert response.status_code == 404 @@ -329,9 +329,8 @@ def test_send_notification_invalid_template_id(notify_api, sample_template, mock app.celery.tasks.send_sms.apply_async.assert_not_called() assert response.status_code == 404 - assert len(json_resp['message'].keys()) == 1 - test_string = 'Template {} not found for service {}'.format(9999, sample_template.service.id) - assert test_string in json_resp['message']['template'] + test_string = 'No result found' + assert test_string in json_resp['message'] @freeze_time("2016-01-01 11:09:00.061258") @@ -495,8 +494,8 @@ def test_should_not_allow_template_from_another_service(notify_api, service_fact app.celery.tasks.send_sms.apply_async.assert_not_called() assert response.status_code == 404 - test_string = 'Template {} not found for service {}'.format(service_2_templates[0].id, service_1.id) - assert test_string in json_resp['message']['template'] + test_string = 'No result found' + assert test_string in json_resp['message'] @freeze_time("2016-01-01 11:09:00.061258") @@ -612,11 +611,8 @@ def test_should_reject_email_notification_with_template_id_that_cant_be_found( app.celery.tasks.send_email.apply_async.assert_not_called() assert response.status_code == 404 assert data['result'] == 'error' - test_string = 'Template {} not found for service {}'.format( - 1234, - sample_email_template.service.id - ) - assert test_string in data['message']['template'] + test_string = 'No result found' + assert test_string in data['message'] def test_should_not_allow_email_template_from_another_service(notify_api, service_factory, sample_user, mocker): @@ -649,8 +645,8 @@ def test_should_not_allow_email_template_from_another_service(notify_api, servic app.celery.tasks.send_email.apply_async.assert_not_called() assert response.status_code == 404 - test_string = 'Template {} not found for service {}'.format(service_2_templates[0].id, service_1.id) - assert test_string in json_resp['message']['template'] + test_string = 'No result found' + assert test_string in json_resp['message'] def test_should_not_send_email_if_restricted_and_not_a_service_user(notify_api, sample_email_template, mocker): diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 708d9bf45..73d61bcd6 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -130,7 +130,7 @@ def test_get_service_by_id_should_404_if_no_service(notify_api, notify_db): assert resp.status_code == 404 json_resp = json.loads(resp.get_data(as_text=True)) assert json_resp['result'] == 'error' - assert json_resp['message'] == 'Service not found for service id: {} '.format(service_id) + assert json_resp['message'] == 'No result found' def test_get_service_by_id_and_user(notify_api, service_factory, sample_user): @@ -467,7 +467,7 @@ def test_get_users_for_service_returns_404_when_service_does_not_exist(notify_ap assert response.status_code == 404 result = json.loads(response.get_data(as_text=True)) assert result['result'] == 'error' - assert result['message'] == 'Service not found for id: {}'.format(service_id) + assert result['message'] == 'No result found' def test_default_permissions_are_added_for_user_service(notify_api, @@ -779,7 +779,7 @@ def test_add_existing_user_to_non_existing_service_returns404(notify_api, ) result = json.loads(resp.get_data(as_text=True)) - expected_message = 'Service not found for id: {}'.format(incorrect_id) + expected_message = 'No result found' assert resp.status_code == 404 assert result['result'] == 'error' @@ -833,7 +833,7 @@ def test_add_unknown_user_to_service_returns404(notify_api, notify_db, notify_db ) result = json.loads(resp.get_data(as_text=True)) - expected_message = 'User not found for id: {}'.format(incorrect_id) + expected_message = 'No result found' assert resp.status_code == 404 assert result['result'] == 'error' diff --git a/tests/app/template/test_rest.py b/tests/app/template/test_rest.py index e5e9134bc..32ba0e567 100644 --- a/tests/app/template/test_rest.py +++ b/tests/app/template/test_rest.py @@ -92,7 +92,7 @@ def test_should_be_error_if_service_does_not_exist_on_create(notify_api): json_resp = json.loads(response.get_data(as_text=True)) assert response.status_code == 404 assert json_resp['result'] == 'error' - assert json_resp['message'] == 'Service not found' + assert json_resp['message'] == 'No result found' def test_should_be_error_if_service_does_not_exist_on_update(notify_api): @@ -117,7 +117,7 @@ def test_should_be_error_if_service_does_not_exist_on_update(notify_api): json_resp = json.loads(response.get_data(as_text=True)) assert response.status_code == 404 assert json_resp['result'] == 'error' - assert json_resp['message'] == 'Template not found' + assert json_resp['message'] == 'No result found' def test_must_have_a_subject_on_an_email_template(notify_api, sample_service): @@ -397,17 +397,18 @@ def test_should_return_404_if_no_templates_for_service_with_id(notify_api, sampl with notify_api.test_request_context(): with notify_api.test_client() as client: + uuid_ = uuid.uuid4() auth_header = create_authorization_header( - path='/service/{}/template/{}'.format(sample_service.id, 111), + path='/service/{}/template/{}'.format(sample_service.id, 9999), method='GET' ) response = client.get( - '/service/{}/template/{}'.format(sample_service.id, 111), + '/service/{}/template/{}'.format(sample_service.id, 9999), headers=[auth_header] ) assert response.status_code == 404 json_resp = json.loads(response.get_data(as_text=True)) assert json_resp['result'] == 'error' - assert json_resp['message'] == 'Template not found' + assert json_resp['message'] == 'No result found' diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py index 466cf0c50..1679e0c17 100644 --- a/tests/app/user/test_rest.py +++ b/tests/app/user/test_rest.py @@ -258,7 +258,7 @@ def test_put_user_not_exists(notify_api, notify_db, notify_db_session, sample_us user = User.query.filter_by(id=sample_user.id).first() json_resp = json.loads(resp.get_data(as_text=True)) assert json_resp['result'] == "error" - assert json_resp['message'] == "User not found for id: {}".format("9999") + assert json_resp['message'] == 'No result found' assert user == sample_user assert user.email_address != new_email @@ -299,7 +299,7 @@ def test_get_user_by_email_not_found_returns_404(notify_api, assert resp.status_code == 404 json_resp = json.loads(resp.get_data(as_text=True)) assert json_resp['result'] == 'error' - assert json_resp['message'] == 'User not found for email address' + assert json_resp['message'] == 'No result found' def test_get_user_by_email_bad_url_returns_404(notify_api, @@ -469,7 +469,7 @@ def test_send_user_reset_password_should_return_400_when_user_doesnot_exist(noti headers=[('Content-Type', 'application/json'), auth_header]) assert resp.status_code == 404 - assert json.loads(resp.get_data(as_text=True))['message'] == 'User not found for email address' + assert json.loads(resp.get_data(as_text=True))['message'] == 'No result found' def test_send_user_reset_password_should_return_400_when_data_is_not_email_address(notify_api, mocker): diff --git a/tests/app/user/test_rest_verify.py b/tests/app/user/test_rest_verify.py index b1564b372..12dd3b5ba 100644 --- a/tests/app/user/test_rest_verify.py +++ b/tests/app/user/test_rest_verify.py @@ -298,7 +298,7 @@ def test_send_sms_code_returns_404_for_bad_input_data(notify_api, notify_db, not data=data, headers=[('Content-Type', 'application/json'), auth_header]) assert resp.status_code == 404 - assert json.loads(resp.get_data(as_text=True))['message'] == 'User not found for id: {}'.format(int(uuid_)) + assert json.loads(resp.get_data(as_text=True))['message'] == 'No result found' def test_send_user_email_code(notify_api, @@ -340,4 +340,4 @@ def test_send_user_email_code_returns_404_for_when_user_does_not_exist(notify_ap data=data, headers=[('Content-Type', 'application/json'), auth_header]) assert resp.status_code == 404 - assert json.loads(resp.get_data(as_text=True))['message'] == 'User not found for id: {}'.format(1) + assert json.loads(resp.get_data(as_text=True))['message'] == 'No result found'