Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initialize UserStore before client connects in integration tests

Browse source 
This fixes a failure in `test_contacts` where we were receiving the
initial `proto::UpdateContacts` message before `UserStore` had a chance
to register a message handler for it.
This commit is contained in:
Antonio Scandurra 2022-05-16 09:48:24 +02:00
parent 842bfae3af
commit bf638afac5
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/collab/src/rpc.rs
View file

@ -4868,7 +4868,9 @@ mod tests {
("user_a", true, vec![]), ("user_a", true, vec![]),
("user_b", true, vec![]), ("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4887,7 +4889,9 @@ mod tests {
("user_a", true, vec![("a", vec![])]), ("user_a", true, vec![("a", vec![])]),
("user_b", true, vec![]), ("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4903,7 +4907,9 @@ mod tests {
("user_a", true, vec![("a", vec!["user_b"])]), ("user_a", true, vec![("a", vec!["user_b"])]),
("user_b", true, vec![]), ("user_b", true, vec![]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4922,7 +4928,9 @@ mod tests {
("user_a", true, vec![("a", vec!["user_b"])]), ("user_a", true, vec![("a", vec!["user_b"])]),
("user_b", true, vec![("b", vec![])]), ("user_b", true, vec![("b", vec![])]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4944,7 +4952,9 @@ mod tests {
("user_a", true, vec![]), ("user_a", true, vec![]),
("user_b", true, vec![("b", vec![])]), ("user_b", true, vec![("b", vec![])]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4960,7 +4970,9 @@ mod tests {
("user_a", true, vec![]), ("user_a", true, vec![]),
("user_b", true, vec![("b", vec![])]), ("user_b", true, vec![("b", vec![])]),
("user_c", false, vec![]) ("user_c", false, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -4983,7 +4995,9 @@ mod tests {
("user_a", true, vec![]), ("user_a", true, vec![]),
("user_b", true, vec![("b", vec![])]), ("user_b", true, vec![("b", vec![])]),
("user_c", true, vec![]) ("user_c", true, vec![])
] ],
"{} has the wrong contacts",
client.username
) )
}); });
} }
@ -6279,19 +6293,18 @@ mod tests {
}) })
}); });
client
.authenticate_and_connect(false, &cx.to_async())
.await
.unwrap();
Channel::init(&client); Channel::init(&client);
Project::init(&client); Project::init(&client);
cx.update(|cx| { cx.update(|cx| {
workspace::init(&client, cx); workspace::init(&client, cx);
}); });
let peer_id = PeerId(connection_id_rx.next().await.unwrap().0);
let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http, cx)); let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http, cx));
client
.authenticate_and_connect(false, &cx.to_async())
.await
.unwrap();
let peer_id = PeerId(connection_id_rx.next().await.unwrap().0);
let client = TestClient { let client = TestClient {
client, client,