Cargo clippy and cargo fmt
This commit is contained in:
parent
b0000c0117
commit
ed609cf06c
22 changed files with 286 additions and 94 deletions
|
|
@ -2,14 +2,16 @@ use crate::test::error_test::*;
|
|||
use dao::booking::{BookingEntity, MockBookingDao};
|
||||
use mockall::predicate::eq;
|
||||
use service::{
|
||||
booking::Booking, clock::MockClockService, sales_person::MockSalesPersonService, slot::MockSlotService, uuid_service::MockUuidService, MockPermissionService, ValidationFailureItem
|
||||
booking::Booking, clock::MockClockService, sales_person::MockSalesPersonService,
|
||||
slot::MockSlotService, uuid_service::MockUuidService, MockPermissionService,
|
||||
ValidationFailureItem,
|
||||
};
|
||||
use time::{Date, Month, PrimitiveDateTime, Time};
|
||||
use uuid::{uuid, Uuid};
|
||||
|
||||
use super::error_test::NoneTypeExt;
|
||||
use crate::booking::BookingServiceImpl;
|
||||
use service::booking::BookingService;
|
||||
use super::error_test::NoneTypeExt;
|
||||
|
||||
pub fn default_id() -> Uuid {
|
||||
uuid!("CEA260A0-112B-4970-936C-F7E529955BD0")
|
||||
|
|
@ -94,7 +96,9 @@ impl BookingServiceDependencies {
|
|||
|
||||
pub fn build_dependencies(permission: bool, role: &'static str) -> BookingServiceDependencies {
|
||||
let mut booking_dao = MockBookingDao::new();
|
||||
booking_dao.expect_find_by_booking_data().returning(|_, _, _, _| Ok(None));
|
||||
booking_dao
|
||||
.expect_find_by_booking_data()
|
||||
.returning(|_, _, _, _| Ok(None));
|
||||
let mut permission_service = MockPermissionService::new();
|
||||
permission_service
|
||||
.expect_check_permission()
|
||||
|
|
@ -357,7 +361,12 @@ async fn test_create_booking_data_already_exists() {
|
|||
deps.booking_dao.checkpoint();
|
||||
deps.booking_dao
|
||||
.expect_find_by_booking_data()
|
||||
.with(eq(default_sales_person_id()), eq(default_slot_id()), eq(3), eq(2024))
|
||||
.with(
|
||||
eq(default_sales_person_id()),
|
||||
eq(default_slot_id()),
|
||||
eq(3),
|
||||
eq(2024),
|
||||
)
|
||||
.returning(|_, _, _, _| Ok(Some(default_booking_entity())));
|
||||
let service = deps.build_service();
|
||||
let result = service
|
||||
|
|
@ -371,12 +380,7 @@ async fn test_create_booking_data_already_exists() {
|
|||
().auth(),
|
||||
)
|
||||
.await;
|
||||
test_validation_error(
|
||||
&result,
|
||||
&ValidationFailureItem::Duplicate,
|
||||
1,
|
||||
);
|
||||
|
||||
test_validation_error(&result, &ValidationFailureItem::Duplicate, 1);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
|
|
|||
|
|
@ -122,5 +122,4 @@ impl NoneTypeExt for () {
|
|||
fn auth(&self) -> Authentication<()> {
|
||||
Authentication::Context(())
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ async fn test_check_permission() {
|
|||
|
||||
let permission_service =
|
||||
PermissionServiceImpl::new(Arc::new(permission_dao), Arc::new(user_service));
|
||||
let result = permission_service.check_permission("hello", ().auth()).await;
|
||||
let result = permission_service
|
||||
.check_permission("hello", ().auth())
|
||||
.await;
|
||||
result.expect("Expected successful authorization");
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +42,9 @@ async fn test_check_permission_denied() {
|
|||
|
||||
let permission_service =
|
||||
PermissionServiceImpl::new(Arc::new(permission_dao), Arc::new(user_service));
|
||||
let result = permission_service.check_permission("hello", ().auth()).await;
|
||||
let result = permission_service
|
||||
.check_permission("hello", ().auth())
|
||||
.await;
|
||||
test_forbidden(&result);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -527,7 +527,10 @@ async fn test_exists() {
|
|||
.with(eq(default_id()))
|
||||
.returning(|_| Ok(Some(default_sales_person_entity())));
|
||||
let sales_person_service = dependencies.build_service();
|
||||
let result = sales_person_service.exists(default_id(), ().auth()).await.unwrap();
|
||||
let result = sales_person_service
|
||||
.exists(default_id(), ().auth())
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(result);
|
||||
|
||||
let mut dependencies = build_dependencies(true, "hr");
|
||||
|
|
@ -537,6 +540,9 @@ async fn test_exists() {
|
|||
.expect_find_by_id()
|
||||
.with(eq(default_id()))
|
||||
.returning(|_| Ok(None));
|
||||
let result = sales_person_service.exists(default_id(), ().auth()).await.unwrap();
|
||||
let result = sales_person_service
|
||||
.exists(default_id(), ().auth())
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(false, !result);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -257,7 +257,9 @@ async fn test_create_slot() {
|
|||
async fn test_create_slot_no_permission() {
|
||||
let dependencies = build_dependencies(false, "hr");
|
||||
let slot_service = dependencies.build_service();
|
||||
let result = slot_service.create_slot(&generate_default_slot(), ().auth()).await;
|
||||
let result = slot_service
|
||||
.create_slot(&generate_default_slot(), ().auth())
|
||||
.await;
|
||||
test_forbidden(&result);
|
||||
}
|
||||
|
||||
|
|
@ -568,7 +570,9 @@ async fn test_delete_slot_not_found() {
|
|||
async fn test_update_slot_no_permission() {
|
||||
let dependencies = build_dependencies(false, "hr");
|
||||
let slot_service = dependencies.build_service();
|
||||
let result = slot_service.update_slot(&generate_default_slot(), ().auth()).await;
|
||||
let result = slot_service
|
||||
.update_slot(&generate_default_slot(), ().auth())
|
||||
.await;
|
||||
test_forbidden(&result);
|
||||
}
|
||||
|
||||
|
|
@ -582,7 +586,9 @@ async fn test_update_slot_not_found() {
|
|||
.times(1)
|
||||
.returning(|_| Ok(None));
|
||||
let slot_service = dependencies.build_service();
|
||||
let result = slot_service.update_slot(&generate_default_slot(), ().auth()).await;
|
||||
let result = slot_service
|
||||
.update_slot(&generate_default_slot(), ().auth())
|
||||
.await;
|
||||
test_not_found(&result, &default_id());
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue