diff --git a/.ds.baseline b/.ds.baseline index 4dd3b3fb1..44e49ccd2 100644 --- a/.ds.baseline +++ b/.ds.baseline @@ -305,7 +305,7 @@ "filename": "tests/app/service/test_rest.py", "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8", "is_verified": false, - "line_number": 1278, + "line_number": 1275, "is_secret": false } ], @@ -384,5 +384,5 @@ } ] }, - "generated_at": "2024-11-11T16:20:52Z" + "generated_at": "2024-11-11T16:49:37Z" } diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index b0172e7a4..a5b22ddd3 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -1,11 +1,10 @@ import json import uuid from datetime import date, datetime, timedelta -from unittest import TestCase from unittest.mock import ANY import pytest -from flask import Flask, current_app, request, url_for +from flask import current_app, url_for from freezegun import freeze_time from sqlalchemy.exc import SQLAlchemyError @@ -25,7 +24,6 @@ from app.enums import ( StatisticsType, TemplateType, ) -from app.errors import InvalidRequest from app.models import ( AnnualBilling, EmailBranding, @@ -38,7 +36,6 @@ from app.models import ( ServiceSmsSender, User, ) -from app.service.rest import check_request_args from app.utils import utc_now from tests import create_admin_authorization_header from tests.app.db import ( @@ -3677,63 +3674,3 @@ def test_get_service_notification_statistics_by_day( assert mock_get_service_statistics_for_specific_days.assert_called_once assert response == mock_data - - -test_app = Flask(__name__) - - -class TestCheckRequestArgs(TestCase): - - def test_check_request_args_valid(self): - with test_app.test_request_context( - query_string={ - "service_id": "123", - "name": "Test Service", - "email_from": "test@example.com", - } - ): - - service_id, name, email_from = check_request_args(request) - self.assertEqual(service_id, "123") - self.assertEqual(name, "Test Service") - self.assertEqual(email_from, "test@example.com") - - def test_check_request_args_missing_service_id(self): - with test_app.test_request_context( - query_string={"name": "Test Service", "email_from": "test@example.com"} - ): - - with self.assertRaise(InvalidRequest) as context: - check_request_args(request) - self.assertEqual(context.exception.status_code, 400) - self.assertIn({"service_id": ["Can't be empty"]}, context.exception.errors) - - def test_check_request_args_missing_name(self): - with test_app.test_request_context( - query_string={"service_id": "123", "email_from": "test@example.com"} - ): - - with self.assertRaise(InvalidRequest) as context: - check_request_args(request) - self.assertEqual(context.exception.status_code, 400) - self.assertIn({"name": ["Can't be empty"]}, context.exception.errors) - - def test_check_request_args_missing_email_from(self): - with test_app.test_request_context( - query_string={"service_id": "123", "name": "Test Service"} - ): - - with self.assertRaise(InvalidRequest) as context: - check_request_args(request) - self.assertEqual(context.exception.status_code, 400) - self.assertIn({"email_from": ["Can't be empty"]}, context.exception.errors) - - def test_check_request_args_missing_all(self): - with test_app.test_request_context(query_string={}): - - with self.assertRaise(InvalidRequest) as context: - check_request_args(request) - self.assertEqual(context.exception.status_code, 400) - self.assertIn({"email_from": ["Can't be empty"]}, context.exception.errors) - self.assertIn({"name": ["Can't be empty"]}, context.exception.errors) - self.assertIn({"service_id": ["Can't be empty"]}, context.exception.errors)