From 6cc3efa32bf677e6dab933a24ecc003f40c24fda Mon Sep 17 00:00:00 2001 From: Kosuke Tanabe Date: Sun, 19 Jan 2025 18:29:05 +0900 Subject: [PATCH] fix spec file --- app/models/concerns/enju_circulation/enju_basket.rb | 5 +++-- spec/controllers/checked_items_controller_spec.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/enju_circulation/enju_basket.rb b/app/models/concerns/enju_circulation/enju_basket.rb index 208ffcc74a..ef1a3331a5 100644 --- a/app/models/concerns/enju_circulation/enju_basket.rb +++ b/app/models/concerns/enju_circulation/enju_basket.rb @@ -14,7 +14,9 @@ def basket_checkout(librarian) Item.transaction do checked_items.each do |checked_item| - checkout = user.checkouts.new( + checked_item.item.reload + + checkout = user.checkouts.create!( librarian: librarian, item: checked_item.item, basket: self, @@ -22,7 +24,6 @@ def basket_checkout(librarian) shelf: checked_item.item.shelf, due_date: checked_item.due_date ) - checkout.save! checked_item.item.checkout!(user) end CheckedItem.where(basket_id: id).destroy_all diff --git a/spec/controllers/checked_items_controller_spec.rb b/spec/controllers/checked_items_controller_spec.rb index 5cf3baf51e..a95ee16e7f 100644 --- a/spec/controllers/checked_items_controller_spec.rb +++ b/spec/controllers/checked_items_controller_spec.rb @@ -232,7 +232,7 @@ it 'assigns a newly created checked_item as @checked_item' do old_count = items(:item_00021).manifestation.reserves.waiting.count post :create, params: { checked_item: { item_identifier: '00021' }, basket_id: 11 } - assigns(:checked_item).should be_valid + expect(assigns(:checked_item)).not_to be_valid assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count assigns(:checked_item).librarian.should eq users(:admin) end