fix tests

deltachat-rpc-client/tests/test_something.py

@@ -1,6 +1,7 @@
 import pytest
 
 from deltachat_rpc_client import AttrDict, EventType, events
+from deltachat_rpc_client.rpc import JsonRpcError
 
 
 @pytest.mark.asyncio
@@ -54,9 +55,10 @@ async def test_account(acfactory) -> None:
             msg_id = event.msg_id
             break
 
-    message = await bob.get_message_by_id(msg_id).get_snapshot()
-    assert message.chat_id == chat_id
-    assert message.text == "Hello!"
+    message = await bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
     await bob.mark_seen_messages([message])
 
     assert alice != bob
@@ -77,10 +79,10 @@ async def test_account(acfactory) -> None:
 
     group = await alice.create_group("test group")
     await group.add_contact(alice_contact_bob)
-    msg = await group.send_message(text="hello")
-    assert msg == await alice.get_message_by_id(msg.id)
+    group_msg = await group.send_message(text="hello")
+    assert group_msg == await alice.get_message_by_id(group_msg.id)
     assert group == await alice.get_chat_by_id(group.id)
-    await alice.delete_messages([msg])
+    await alice.delete_messages([group_msg])
 
     await alice.set_config("selfstatus", "test")
     assert await alice.get_config("selfstatus") == "test"
@@ -112,9 +114,10 @@ async def test_chat(acfactory) -> None:
             chat_id = event.chat_id
             msg_id = event.msg_id
             break
-    message = await bob.get_message_by_id(msg_id).get_snapshot()
-    assert message.chat_id == chat_id
-    assert message.text == "Hello!"
+    message = await bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
     bob_chat_alice = await bob.get_chat_by_id(chat_id)
 
     assert alice_chat_bob != bob_chat_alice
@@ -122,29 +125,38 @@ async def test_chat(acfactory) -> None:
     await alice_chat_bob.delete()
     await bob_chat_alice.accept()
     await bob_chat_alice.block()
-    bob_chat_alice = await message.contact.create_chat()
+    bob_chat_alice = await snapshot.sender.create_chat()
     await bob_chat_alice.mute()
     await bob_chat_alice.unmute()
     await bob_chat_alice.pin()
     await bob_chat_alice.unpin()
     await bob_chat_alice.archive()
     await bob_chat_alice.unarchive()
-    await bob_chat_alice.set_name("test")
+    with pytest.raises(JsonRpcError):  # can't set name for 1:1 chats
+        await bob_chat_alice.set_name("test")
     await bob_chat_alice.set_ephemeral_timer(300)
     await bob_chat_alice.get_encryption_info()
 
     group = await alice.create_group("test group")
     await group.add_contact(alice_contact_bob)
     await group.get_qr_code()
-    assert await group.get_basic_snapshot()
-    assert await group.get_full_snapshot()
+
+    snapshot = await group.get_basic_snapshot()
+    assert snapshot.name == "test group"
+    await group.set_name("new name")
+    snapshot = await group.get_full_snapshot()
+    assert snapshot.name == "new name"
+
     msg = await group.send_message(text="hi")
     assert (await msg.get_snapshot()).text == "hi"
     await group.forward_messages([msg])
-    await group.set_draft(text="draft")
-    assert await group.get_draft()
+
+    await group.set_draft(text="test draft")
+    draft = await group.get_draft()
+    assert draft.text == "test draft"
     await group.remove_draft()
     assert not await group.get_draft()
+
     assert await group.get_messages()
     await group.get_fresh_message_count()
     await group.mark_noticed()
@@ -160,7 +172,7 @@ async def test_contact(acfactory) -> None:
     bob_addr = await bob.get_config("addr")
     alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
 
-    assert alice_contact_bob == alice.get_contact_by_id(alice_contact_bob.id)
+    assert alice_contact_bob == await alice.get_contact_by_id(alice_contact_bob.id)
     assert repr(alice_contact_bob)
     await alice_contact_bob.block()
     await alice_contact_bob.unblock()
@@ -187,12 +199,19 @@ async def test_message(acfactory) -> None:
             msg_id = event.msg_id
             break
 
-    message = await bob.get_message_by_id(msg_id).get_snapshot()
-    assert message.chat_id == chat_id
-    assert message.text == "Hello!"
+    message = await bob.get_message_by_id(msg_id)
+    snapshot = await message.get_snapshot()
+    assert snapshot.chat_id == chat_id
+    assert snapshot.text == "Hello!"
     assert repr(message)
+
+    with pytest.raises(JsonRpcError):  # chat is not accepted
+        await snapshot.chat.send_text("hi")
+    await snapshot.chat.accept()
+    await snapshot.chat.send_text("hi")
+
     await message.mark_seen()
-    assert await message.send_reaction("😎")
+    await message.send_reaction("😎")
 
 
 @pytest.mark.asyncio