Skip to content

Commit de16f1d

Browse files
carols10centsJohnTitor
authored andcommitted
Change test helper method to take a username string instead of model
This mimics what people provide in the UI or via Cargo, and will let us easier test differences in case, for example.
1 parent 2ba19be commit de16f1d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/tests/owners.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn new_crate_owner() {
9494

9595
// Add the second user as an owner
9696
let user2 = app.db_new_user("bar");
97-
token.add_user_owner("foo_owner", user2.as_model());
97+
token.add_user_owner("foo_owner", "bar");
9898

9999
// accept invitation for user to be added as owner
100100
let crate_id = app.db(|conn| Crate::by_name("foo_owner").first::<Crate>(conn).unwrap().id);
@@ -119,7 +119,7 @@ fn create_and_add_owner(
119119
krate: &Crate,
120120
) -> MockCookieUser {
121121
let user = app.db_new_user(username);
122-
token.add_user_owner(&krate.name, user.as_model());
122+
token.add_user_owner(&krate.name, username);
123123
user.accept_ownership_invitation(&krate.name, krate.id);
124124
user
125125
}
@@ -301,7 +301,7 @@ fn invitations_list() {
301301
let krate = app.db(|conn| CrateBuilder::new("invited_crate", owner.id).expect_build(conn));
302302

303303
let user = app.db_new_user("invited_user");
304-
token.add_user_owner("invited_crate", user.as_model());
304+
token.add_user_owner("invited_crate", "invited_user");
305305

306306
let json = user.list_invitations();
307307
assert_eq!(json.crate_owner_invitations.len(), 1);
@@ -327,7 +327,7 @@ fn test_accept_invitation() {
327327
let krate = app.db(|conn| CrateBuilder::new("accept_invitation", owner.id).expect_build(conn));
328328

329329
// Invite a new owner
330-
owner_token.add_user_owner("accept_invitation", invited_user.as_model());
330+
owner_token.add_user_owner("accept_invitation", "user_bar");
331331

332332
// New owner accepts the invitation
333333
invited_user.accept_ownership_invitation(&krate.name, krate.id);
@@ -354,7 +354,7 @@ fn test_decline_invitation() {
354354
let krate = app.db(|conn| CrateBuilder::new("decline_invitation", owner.id).expect_build(conn));
355355

356356
// Invite a new owner
357-
owner_token.add_user_owner("decline_invitation", invited_user.as_model());
357+
owner_token.add_user_owner("decline_invitation", "user_bar");
358358

359359
// Invited user declines the invitation
360360
invited_user.decline_ownership_invitation(&krate.name, krate.id);

src/tests/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,8 +548,8 @@ impl MockTokenUser {
548548
}
549549

550550
/// Add a user as an owner for a crate.
551-
pub fn add_user_owner(&self, krate_name: &str, user: &User) {
552-
self.add_named_owner(krate_name, &user.gh_login).good();
551+
pub fn add_user_owner(&self, krate_name: &str, username: &str) {
552+
self.add_named_owner(krate_name, username).good();
553553
}
554554
}
555555

0 commit comments

Comments
 (0)