Merge pull request 'fix tests' (#792) from formating-ergo into main
Reviewed-on: #792
This commit is contained in:
commit
c8cfcd619f
@ -463,7 +463,13 @@ WHERE trip_details.id=?
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use crate::{model::tripdetails::TripDetails, testdb};
|
use crate::{
|
||||||
|
model::{
|
||||||
|
tripdetails::TripDetails,
|
||||||
|
user::{EventUser, User},
|
||||||
|
},
|
||||||
|
testdb,
|
||||||
|
};
|
||||||
|
|
||||||
use super::Event;
|
use super::Event;
|
||||||
use chrono::Local;
|
use chrono::Local;
|
||||||
@ -483,7 +489,10 @@ mod test {
|
|||||||
|
|
||||||
let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
|
let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
|
||||||
|
|
||||||
Event::create(&pool, "new-event".into(), 2, false, &trip_details).await;
|
let admin = EventUser::new(&pool, User::find_by_id(&pool, 1).await.unwrap())
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
Event::create(&pool, &admin, "new-event".into(), 2, false, &trip_details).await;
|
||||||
|
|
||||||
let res = Event::get_for_day(&pool, Local::now().date_naive()).await;
|
let res = Event::get_for_day(&pool, Local::now().date_naive()).await;
|
||||||
assert_eq!(res.len(), 2);
|
assert_eq!(res.len(), 2);
|
||||||
|
@ -221,7 +221,7 @@ mod test {
|
|||||||
notification::Notification,
|
notification::Notification,
|
||||||
trip::Trip,
|
trip::Trip,
|
||||||
tripdetails::{TripDetails, TripDetailsToAdd},
|
tripdetails::{TripDetails, TripDetailsToAdd},
|
||||||
user::{SteeringUser, User},
|
user::{EventUser, SteeringUser, User},
|
||||||
usertrip::UserTrip,
|
usertrip::UserTrip,
|
||||||
},
|
},
|
||||||
testdb,
|
testdb,
|
||||||
@ -247,7 +247,10 @@ mod test {
|
|||||||
let trip_details = TripDetails::find_by_id(&pool, tripdetails_id)
|
let trip_details = TripDetails::find_by_id(&pool, tripdetails_id)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
Event::create(&pool, "new-event".into(), 2, false, &trip_details).await;
|
let user = EventUser::new(&pool, User::find_by_id(&pool, 1).await.unwrap())
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
Event::create(&pool, &user, "new-event".into(), 2, false, &trip_details).await;
|
||||||
let event = Event::find_by_trip_details(&pool, trip_details.id)
|
let event = Event::find_by_trip_details(&pool, trip_details.id)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
Loading…
Reference in New Issue
Block a user