enju_circulation 0.1.0.pre11 → 0.1.0.pre12

data/spec/controllers/reserves_controller_spec.rb

@@ -3,7 +3,11 @@ require 'spec_helper'
 describe ReservesController do
   fixtures :all
 
-  describe "GET index" do
+  describe "GET index", :solr => true do
+    before do
+      Reserve.reindex
+    end
+
     describe "When logged in as Administrator" do
       login_fixture_admin
 
@@ -30,13 +34,13 @@ describe ReservesController do
       it "should get index feed without user_id" do
         get :index, :format => 'rss'
         response.should be_success
-        assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation).page(1))
+        assigns(:reserves).collect(&:id).should eq Reserve.order('reserves.id DESC').includes(:manifestation).page(1).collect(&:id)
       end
 
       it "should get index csv without user_id" do
         get :index, :format => 'csv'
         response.should be_success
-        assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation).page(1))
+        assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation))
       end
 
       it "should get index feed with user_id" do
@@ -48,7 +52,7 @@ describe ReservesController do
       it "should get index csv with user_id" do
         get :index, :user_id => users(:user1).username, :format => 'csv'
         response.should be_success
-        assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
+        assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation))
       end
 
       it "should get other user's index" do
@@ -519,7 +523,7 @@ describe ReservesController do
     before(:each) do
       @reserve = FactoryGirl.create(:reserve)
       @attrs = FactoryGirl.attributes_for(:reserve)
-      @invalid_attrs = {:manifestation_id => ''}
+      @invalid_attrs = {:manifestation_id => 'invalid'}
     end
 
     describe "When logged in as Administrator" do
@@ -559,6 +563,26 @@ describe ReservesController do
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
+
+      it "should not update retained reservations if item_identifier is invalid" do
+        put :update, :id => 14, :reserve => {:item_identifier => 'invalid'}
+        assigns(:reserve).should_not be_valid
+        response.should be_success
+      end
+
+      it "should not update retained reservations if force_retaining is disabled" do
+        put :update, :id => 15, :reserve => {:item_identifier => '00021'}
+        assigns(:reserve).should_not be_valid
+        response.should be_success
+        reserves(:reserve_00014).state.should eq 'retained'
+      end
+
+      it "should update retained reservations if force_retaining is enabled" do
+        put :update, :id => 15, :reserve => {:item_identifier => '00021', :force_retaining => '1'}
+        assigns(:reserve).should be_valid
+        response.should redirect_to reserve_url(assigns(:reserve))
+        reserves(:reserve_00014).state.should eq 'postponed'
+      end
     end
 
     describe "When logged in as Librarian" do

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121119153944) do
+ActiveRecord::Schema.define(:version => 20130304015019) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -713,11 +713,14 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.string   "state"
     t.boolean  "expiration_notice_to_patron",  :default => false
     t.boolean  "expiration_notice_to_library", :default => false
+    t.datetime "retained_at"
+    t.datetime "postponed_at"
   end
 
   add_index "reserves", ["item_id"], :name => "index_reserves_on_item_id"
   add_index "reserves", ["manifestation_id"], :name => "index_reserves_on_manifestation_id"
   add_index "reserves", ["request_status_type_id"], :name => "index_reserves_on_request_status_type_id"
+  add_index "reserves", ["state"], :name => "index_reserves_on_state"
   add_index "reserves", ["user_id"], :name => "index_reserves_on_user_id"
 
   create_table "roles", :force => true do |t|

data/spec/dummy/solr/data/test/index/_5d.fnm

@@ -0,0 +1,4 @@
+����idtype
+class_name
+username_s
+title_text
item_identifier_text

data/spec/dummy/solr/data/test/index/_5d.frq

@@ -0,0 +1 @@
+

	

data/spec/dummy/solr/data/test/index/_5d.nrm

@@ -0,0 +1 @@
+NRM�|||||||||||||||xtuxuxuuxuxuttt||||||v|||||xxx

data/spec/fixtures/message_templates.yml

@@ -68,3 +68,17 @@ message_template_00010:
   body: Item received
   position: 10
   locale: ja
+message_template_00011:
+  id: 11
+  status: reservation_postponed_for_patron
+  title: Reservation postponed
+  body: Reservation postponed
+  position: 11
+  locale: ja
+message_template_00012:
+  id: 12
+  status: reservation_postponed_for_library
+  title: Reservation postponed
+  body: Reservation postponed
+  position: 12
+  locale: ja

data/spec/fixtures/reserves.yml

@@ -1,4 +1,22 @@
 --- 
+reserve_00001: 
+  updated_at: 2007-09-02 17:51:54.887849 +09:00
+  manifestation_id: 4
+  user_id: 1
+  request_status_type_id: 4
+  id: 1
+  created_at: 2007-09-01 14:14:52.356803 +09:00
+  expired_at: <%= 1.week.from_now %>
+  state: requested
+reserve_00002: 
+  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  manifestation_id: 5
+  user_id: 2
+  request_status_type_id: 4
+  id: 2
+  created_at: 2007-09-01 14:20:05.530854 +09:00
+  expired_at: <%= 1.week.from_now %>
+  state: requested
 reserve_00003: 
   updated_at: 2007-09-02 17:46:52.791614 +09:00
   manifestation_id: 6
@@ -26,114 +44,97 @@ reserve_00005:
   created_at: 2007-09-02 19:16:55.714812 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
-reserve_00001: 
-  updated_at: 2007-09-02 17:51:54.887849 +09:00
-  manifestation_id: 4
-  user_id: 1
-  request_status_type_id: 4
-  id: 1
-  created_at: 2007-09-01 14:14:52.356803 +09:00
-  expired_at: <%= 1.week.from_now %>
-  state: requested
-reserve_00002: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
-  manifestation_id: 5
-  user_id: 2
-  request_status_type_id: 4
-  id: 2
-  created_at: 2007-09-01 14:20:05.530854 +09:00
-  expired_at: <%= 1.week.from_now %>
-  state: requested
 reserve_00006: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-02 19:20:06.530854 +09:00
   manifestation_id: 4
   user_id: 2
   request_status_type_id: 4
   id: 6
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-02 19:20:06.530854 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
 reserve_00007: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-02 19:20:07.530854 +09:00
   manifestation_id: 2
   user_id: 4
   request_status_type_id: 4
   id: 7
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-02 19:20:07.530854 +09:00
   expired_at: <%= 1.week.from_now %>
   state: requested
 reserve_00008: 
-  updated_at: 2007-09-02 17:46:52.791614 +09:00
+  updated_at: 2007-09-02 19:46:53.791614 +09:00
   manifestation_id: 6
   user_id: 3
   request_status_type_id: 3
   id: 8
-  created_at: 2007-09-02 17:46:52.791614 +09:00
+  created_at: 2007-09-02 19:46:53.791614 +09:00
   expired_at: <%= 1.week.ago %>
   state: expired
 reserve_00009: 
-  updated_at: 2007-09-02 17:46:52.791614 +09:00
+  updated_at: 2007-09-02 19:46:54.791614 +09:00
   manifestation_id: 7
   user_id: 5
   request_status_type_id: 3
   id: 9
-  created_at: 2007-09-02 17:46:52.791614 +09:00
+  created_at: 2007-09-02 19:46:54.791614 +09:00
   expired_at: <%= 1.day.ago %>
   state: requested
 reserve_00010: 
-  updated_at: 2007-09-02 17:46:52.791614 +09:00
+  updated_at: 2007-09-02 19:46:55.791614 +09:00
   manifestation_id: 8
   user_id: 5
   request_status_type_id: 3
   id: 10
-  created_at: 2007-09-02 17:46:52.791614 +09:00
+  created_at: 2007-09-02 19:46:55.791614 +09:00
   expired_at: <%= 1.hour.ago %>
   checked_out_at: <%= 1.week.ago %>
   state: completed
 reserve_00011: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-03 14:20:05.530854 +09:00
   manifestation_id: 7
   user_id: 2
   request_status_type_id: 3
   id: 11
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-03 14:20:05.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: expired
 reserve_00012: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-03 14:20:06.530854 +09:00
   manifestation_id: 8
   user_id: 2
   request_status_type_id: 4
   id: 12
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-03 14:20:06.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: retained
 reserve_00013: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-03 14:20:07.530854 +09:00
   manifestation_id: 11
   user_id: 4
   request_status_type_id: 3
   id: 13
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-03 14:20:07.530854 +09:00
   expired_at: <%= 1.day.ago %>
   state: requested
 reserve_00014: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-03 14:20:08.530854 +09:00
   manifestation_id: 11
   user_id: 4
   request_status_type_id: 3
   id: 14
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-03 14:20:08.530854 +09:00
+  retained_at: <%= 1.hour.from_now %>
   expired_at: <%= 1.day.from_now %>
   state: retained
   item_id: 21
 reserve_00015: 
-  updated_at: 2007-09-01 14:20:05.530854 +09:00
+  updated_at: 2007-09-03 14:20:09.530854 +09:00
   manifestation_id: 11
   user_id: 4
   request_status_type_id: 3
   id: 15
-  created_at: 2007-09-01 14:20:05.530854 +09:00
+  created_at: 2007-09-03 14:20:09.530854 +09:00
   expired_at: <%= 1.day.from_now %>
   state: requested
 

data/spec/models/reserve_spec.rb

@@ -11,9 +11,10 @@ describe Reserve do
   it "should notify a next reservation" do
     old_count = Message.count
     reserve = reserves(:reserve_00014)
+    item = reserve.next_reservation.item
     reserve.sm_expire!
     reserve.state.should eq 'expired'
-    reserve.next_reservation.item.should eq reserve.item
+    item.should eq reserve.item
     Message.count.should eq old_count + 2
   end
 
@@ -66,6 +67,29 @@ describe Reserve do
   it "should send accepted notification" do
     assert Reserve.expire.should be_true
   end
+
+  it "should nullify the first reservation's item_id if the second reservation is retained" do
+    reservation = reserves(:reserve_00015)
+    old_reservation = reserves(:reserve_00014)
+    old_count = MessageRequest.count
+
+    reservation.item = old_reservation.item
+    reservation.sm_retain!
+    old_reservation.reload
+    assert old_reservation.item.should be_nil
+    assert reservation.retained_at.should be_true
+    assert old_reservation.retained_at.should be_nil
+    assert old_reservation.postponed_at.should be_true
+    assert old_reservation.state.should eq 'postponed'
+    assert MessageRequest.count.should eq old_count + 4
+  end
+
+  it "should not be valid if item_identifier is invalid" do
+    reservation = reserves(:reserve_00014)
+    reservation.item_identifier = 'invalid'
+    reservation.save
+    assert reservation.valid?.should eq false
+  end
 end
 
 # == Schema Information