Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions tests/api/test_api_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@


@pytest.mark.django_db
def test_api_is_chat_enabled_for_user(load_test_data: None) -> None:
def test_api_is_chat_enabled_for_user(
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that whether a user is chat beta tester is stored in the DB

Expand All @@ -48,7 +51,9 @@ def test_api_is_chat_enabled_for_user(load_test_data: None) -> None:
@pytest.mark.django_db
@patch("integreat_cms.api.v3.chat.user_chat.UserChat.zammad_request")
def test_api_chat_missing_auth_error(
zammad_request: Mock, load_test_data: None
zammad_request: Mock,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that missing/wrong auth information leads to an error
Expand Down Expand Up @@ -79,7 +84,8 @@ def test_api_chat_missing_auth_error(
)
def test_api_chat_incorrect_server_error(
mock_zammad_url: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that incorrect server url leads to an error
Expand Down Expand Up @@ -124,7 +130,8 @@ def test_api_chat_first_chat(
messages: Mock,
create_ticket: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that sending a message from a never seen-before device_id creates a new chat
Expand Down Expand Up @@ -171,7 +178,8 @@ def test_api_chat_set_evaluation_consent(
save_evaluation_consent: Mock,
messages: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that sending a message from a never seen-before device_id creates a new chat
Expand Down Expand Up @@ -211,7 +219,8 @@ def test_api_chat_send_message(
messages: Mock,
save_message: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that sending a message with a known device_id works and does not create a new chat
Expand Down Expand Up @@ -256,7 +265,8 @@ def test_api_chat_get_messages_success(
evaluation_consent: Mock,
messages: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that GET-ing messages works for an existing chat
Expand All @@ -279,7 +289,9 @@ def test_api_chat_get_messages_success(
return_value="tech@tuerantuer.org",
)
def test_api_chat_get_messages_failure(
get_zammad_user_mail: Mock, load_test_data: None
get_zammad_user_mail: Mock,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that GET-ing messages for a non-existing chat returns an error
Expand Down Expand Up @@ -321,7 +333,8 @@ def test_api_chat_ratelimiting(
evaluation_consent: Mock,
messages: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that the ratelimiting correctly prevents further API requests
Expand Down Expand Up @@ -383,7 +396,8 @@ def test_api_chat_ratelimiting_trusted_ip_header(
evaluation_consent: Mock,
messages: Mock,
get_zammad_user_mail: Mock,
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check that ratelimiting kicks in when a trusted IP header is configured but not set in the request.
Expand Down
11 changes: 8 additions & 3 deletions tests/api/test_api_feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
@pytest.mark.django_db
@pytest.mark.parametrize("view_name,post_data", API_FEEDBACK_VIEWS)
def test_api_feedback_success(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
view_name: str,
post_data: dict[str, str],
) -> None:
Expand Down Expand Up @@ -95,7 +96,8 @@ def test_api_feedback_success(
API_FEEDBACK_ERRORS,
)
def test_api_feedback_errors(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
view_name: str,
kwargs: dict[str, str],
post_data: dict[str, str],
Expand All @@ -121,7 +123,10 @@ def test_api_feedback_errors(


@pytest.mark.django_db
def test_api_feedback_invalid_method(load_test_data: None) -> None:
def test_api_feedback_invalid_method(
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Check error when request method is not POST

Expand Down
5 changes: 4 additions & 1 deletion tests/api/test_api_push_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@


@pytest.mark.django_db
def test_api_push_page_content(load_test_data: None) -> None:
def test_api_push_page_content(
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
This test class checks all endpoints defined in :attr:`~tests.api.api_config.API_ENDPOINTS`.
It verifies that the content delivered by the endpoint is equivalent with the data
Expand Down
3 changes: 2 additions & 1 deletion tests/api/test_api_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
API_ENDPOINTS,
)
def test_api_result(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
django_assert_num_queries: Callable,
endpoint: str,
wp_endpoint: str,
Expand Down
3 changes: 2 additions & 1 deletion tests/api/test_api_social.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
API_SOCIAL_ENDPOINTS,
)
def test_api_result(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
django_assert_num_queries: Callable,
endpoint: str,
expected_result: str,
Expand Down
15 changes: 10 additions & 5 deletions tests/cms/models/contacts/test_contacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

@pytest.mark.django_db
def test_contact_string(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
settings: SettingsWrapper,
) -> None:
"""
Expand All @@ -37,7 +38,8 @@ def test_contact_string(

@pytest.mark.django_db
def test_copying_contact_works(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
assert Contact.objects.all().count() == 5

Expand All @@ -49,7 +51,8 @@ def test_copying_contact_works(

@pytest.mark.django_db
def test_deleting_contact_works(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
assert Contact.objects.all().count() == 5

Expand All @@ -61,7 +64,8 @@ def test_deleting_contact_works(

@pytest.mark.django_db
def test_archiving_contact_works(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
assert Contact.objects.all().count() == 5

Expand All @@ -75,7 +79,8 @@ def test_archiving_contact_works(

@pytest.mark.django_db
def test_restoring_contact_works(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
assert Contact.objects.all().count() == 5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@


@pytest.mark.django_db
def test_best_translation(load_test_data: None) -> None:
def test_best_translation(
test_data_db_snapshot: None,
db_snapshot: None,
) -> None:
"""
Test whether the `best_translation` method functions correctly. This is to prevent the following bug: https://github.com/digitalfabrik/integreat-cms/issues/2726
:param load_test_data: The fixture providing the test data (see :meth:`~tests.conftest.load_test_data`)
Expand Down
10 changes: 6 additions & 4 deletions tests/cms/test_duplicate_regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@


@pytest.mark.order("last")
@pytest.mark.django_db(transaction=True, serialized_rollback=True)
@pytest.mark.django_db(transaction=True)
def test_duplicate_regions(
load_test_data_transactional: None,
test_data_db_snapshot: None,
db_snapshot: None,
admin_client: Client,
) -> None:
"""
Expand Down Expand Up @@ -202,9 +203,10 @@ def test_duplicate_regions(


@pytest.mark.order("last")
@pytest.mark.django_db(transaction=True, serialized_rollback=True)
@pytest.mark.django_db(transaction=True)
def test_duplicate_regions_no_translations(
load_test_data_transactional: None,
test_data_db_snapshot: None,
db_snapshot: None,
admin_client: Client,
) -> None:
"""
Expand Down
12 changes: 8 additions & 4 deletions tests/cms/test_language.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

@pytest.mark.django_db
def test_create_new_language_node(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
login_role_user: tuple[Client, str],
) -> None:
# Log the user in
Expand Down Expand Up @@ -83,7 +84,8 @@ def test_create_new_language_node(

@pytest.mark.django_db
def test_update_language_node(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
login_role_user: tuple[Client, str],
) -> None:
# Log the user in
Expand Down Expand Up @@ -137,7 +139,8 @@ def test_update_language_node(

@pytest.mark.django_db
def test_move_language_node(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
login_role_user: tuple[Client, str],
) -> None:
# Log the user in
Expand Down Expand Up @@ -182,7 +185,8 @@ def test_move_language_node(

@pytest.mark.django_db
def test_delete_language_node(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
login_role_user: tuple[Client, str],
) -> None:
# Log the user in
Expand Down
6 changes: 4 additions & 2 deletions tests/cms/test_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
["root", "root@root.root", "management", "management@example.com"],
)
def test_login_success(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
client: Client,
settings: SettingsWrapper,
username: str,
Expand Down Expand Up @@ -68,7 +69,8 @@ def test_login_success(
],
)
def test_login_failure(
load_test_data: None,
test_data_db_snapshot: None,
db_snapshot: None,
client: Client,
settings: SettingsWrapper,
username: str,
Expand Down
Loading