Skip to content

Commit 7f86ba8

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 c970817 commit 7f86ba8

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
@@ -93,7 +93,7 @@ fn new_crate_owner() {
9393

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

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

302302
let user = app.db_new_user("invited_user");
303-
token.add_user_owner("invited_crate", user.as_model());
303+
token.add_user_owner("invited_crate", "invited_user");
304304

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

328328
// Invite a new owner
329-
owner_token.add_user_owner("accept_invitation", invited_user.as_model());
329+
owner_token.add_user_owner("accept_invitation", "user_bar");
330330

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

355355
// Invite a new owner
356-
owner_token.add_user_owner("decline_invitation", invited_user.as_model());
356+
owner_token.add_user_owner("decline_invitation", "user_bar");
357357

358358
// Invited user declines the invitation
359359
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
@@ -545,8 +545,8 @@ impl MockTokenUser {
545545
}
546546

547547
/// Add a user as an owner for a crate.
548-
pub fn add_user_owner(&self, krate_name: &str, user: &User) {
549-
self.add_named_owner(krate_name, &user.gh_login).good();
548+
pub fn add_user_owner(&self, krate_name: &str, username: &str) {
549+
self.add_named_owner(krate_name, username).good();
550550
}
551551
}
552552

0 commit comments

Comments
 (0)