diff --git a/tests/api/test_alias.py b/tests/api/test_alias.py index 62b9efbe..c4dcf36c 100644 --- a/tests/api/test_alias.py +++ b/tests/api/test_alias.py @@ -393,9 +393,9 @@ def test_update_disable_pgp(flask_client): def test_update_pinned(flask_client): - login(flask_client) + user = login(flask_client) - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() assert not alias.pinned r = flask_client.patch( @@ -490,8 +490,8 @@ def test_create_contact_route(flask_client): def test_create_contact_route_empty_contact_address(flask_client): - login(flask_client) - alias = Alias.first() + user = login(flask_client) + alias = Alias.filter_by(user_id=user.id).first() r = flask_client.post( url_for("api.create_contact_route", alias_id=alias.id), @@ -503,8 +503,8 @@ def test_create_contact_route_empty_contact_address(flask_client): def test_create_contact_route_invalid_contact_email(flask_client): - login(flask_client) - alias = Alias.first() + user = login(flask_client) + alias = Alias.filter_by(user_id=user.id).first() r = flask_client.post( url_for("api.create_contact_route", alias_id=alias.id), diff --git a/tests/api/test_new_random_alias.py b/tests/api/test_new_random_alias.py index e5e7b1ba..5401ba85 100644 --- a/tests/api/test_new_random_alias.py +++ b/tests/api/test_new_random_alias.py @@ -50,7 +50,7 @@ def test_with_custom_domain(flask_client): assert r.status_code == 201 assert r.json["alias"] == "test@ab.cd" - assert Alias.count() == 2 + assert Alias.filter_by(user_id=user.id).count() == 2 # call the endpoint again, should return the same alias r = flask_client.post( @@ -60,7 +60,7 @@ def test_with_custom_domain(flask_client): assert r.status_code == 201 assert r.json["alias"] == "test@ab.cd" # no new alias is created - assert Alias.count() == 2 + assert Alias.filter_by(user_id=user.id).count() == 2 def test_without_hostname(flask_client): diff --git a/tests/api/test_serializer.py b/tests/api/test_serializer.py index 2628136e..ad04a152 100644 --- a/tests/api/test_serializer.py +++ b/tests/api/test_serializer.py @@ -13,7 +13,7 @@ def test_get_alias_infos_with_pagination_v3(flask_client): assert len(alias_infos) == 1 alias_info = alias_infos[0] - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() assert alias_info.alias == alias assert alias_info.mailbox == user.default_mailbox assert alias_info.mailboxes == [user.default_mailbox] @@ -28,7 +28,7 @@ def test_get_alias_infos_with_pagination_v3_query_alias_email(flask_client): """test the query on the alias email""" user = create_new_user() - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() alias_infos = get_alias_infos_with_pagination_v3(user, query=alias.email) assert len(alias_infos) == 1 @@ -40,7 +40,7 @@ def test_get_alias_infos_with_pagination_v3_query_alias_email(flask_client): def test_get_alias_infos_with_pagination_v3_query_alias_mailbox(flask_client): """test the query on the alias mailbox email""" user = create_new_user() - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() alias_infos = get_alias_infos_with_pagination_v3(user, mailbox_id=alias.mailbox_id) assert len(alias_infos) == 1 @@ -48,7 +48,7 @@ def test_get_alias_infos_with_pagination_v3_query_alias_mailbox(flask_client): def test_get_alias_infos_with_pagination_v3_query_alias_mailboxes(flask_client): """test the query on the alias additional mailboxes""" user = create_new_user() - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() mb = Mailbox.create(user_id=user.id, email="mb@gmail.com") alias._mailboxes.append(mb) Session.commit() @@ -64,7 +64,7 @@ def test_get_alias_infos_with_pagination_v3_query_alias_note(flask_client): """test the query on the alias note""" user = create_new_user() - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() alias.note = "test note" Session.commit() @@ -76,7 +76,7 @@ def test_get_alias_infos_with_pagination_v3_query_alias_name(flask_client): """test the query on the alias name""" user = create_new_user() - alias = Alias.first() + alias = Alias.filter_by(user_id=user.id).first() alias.name = "Test Name" Session.commit() @@ -134,7 +134,7 @@ def test_get_alias_infos_pinned_alias(flask_client): for _ in range(2 * PAGE_LIMIT): Alias.create_new_random(user) - first_alias = Alias.order_by(Alias.id).first() + first_alias = Alias.filter_by(user_id=user.id).order_by(Alias.id).first() # should return PAGE_LIMIT alias alias_infos = get_alias_infos_with_pagination_v3(user) diff --git a/tests/dashboard/test_alias_contact_manager.py b/tests/dashboard/test_alias_contact_manager.py index e79801fb..7c5dd12b 100644 --- a/tests/dashboard/test_alias_contact_manager.py +++ b/tests/dashboard/test_alias_contact_manager.py @@ -8,10 +8,10 @@ from tests.utils import login def test_add_contact_success(flask_client): - login(flask_client) - alias = Alias.first() + user = login(flask_client) + alias = Alias.filter(Alias.user_id == user.id).first() - assert Contact.count() == 0 + assert Contact.filter_by(user_id=user.id).count() == 0 # <<< Create a new contact >>> flask_client.post( @@ -23,8 +23,8 @@ def test_add_contact_success(flask_client): follow_redirects=True, ) # a new contact is added - assert Contact.count() == 1 - contact = Contact.first() + assert Contact.filter_by(user_id=user.id).count() == 1 + contact = Contact.filter_by(user_id=user.id).first() assert contact.website_email == "abcd@gmail.com" # <<< Create a new contact using a full email format >>> @@ -37,8 +37,10 @@ def test_add_contact_success(flask_client): follow_redirects=True, ) # a new contact is added - assert Contact.count() == 2 - contact = Contact.filter(Contact.id != contact.id).first() + assert Contact.filter_by(user_id=user.id).count() == 2 + contact = ( + Contact.filter_by(user_id=user.id).filter(Contact.id != contact.id).first() + ) assert contact.website_email == "another@gmail.com" assert contact.name == "First Last" @@ -53,5 +55,5 @@ def test_add_contact_success(flask_client): ) # no new contact is added - assert Contact.count() == 2 + assert Contact.filter_by(user_id=user.id).count() == 2 assert "Invalid email format. Email must be either email@example.com" in str(r.data) diff --git a/tests/dashboard/test_index.py b/tests/dashboard/test_index.py index b44de15f..eff09c69 100644 --- a/tests/dashboard/test_index.py +++ b/tests/dashboard/test_index.py @@ -16,7 +16,7 @@ def test_create_random_alias_success(flask_client): follow_redirects=True, ) assert r.status_code == 200 - assert Alias.count() == 2 + assert Alias.filter(Alias.user_id == user.id).count() == 2 def test_too_many_requests(flask_client):