enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/spec/controllers/reserves_controller_spec.rb

@@ -37,8 +37,8 @@ describe ReservesController do
         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'
+      it "should get index txt without user_id" do
+        get :index, :format => 'txt'
         response.should be_success
         assigns(:reserves).should eq(Reserve.order('reserves.id DESC').includes(:manifestation))
       end
@@ -49,8 +49,8 @@ describe ReservesController do
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation).page(1))
       end
 
-      it "should get index csv with user_id" do
-        get :index, :user_id => users(:user1).username, :format => 'csv'
+      it "should get index txt with user_id" do
+        get :index, :user_id => users(:user1).username, :format => 'txt'
         response.should be_success
         assigns(:reserves).should eq(users(:user1).reserves.order('reserves.id DESC').includes(:manifestation))
       end
@@ -87,8 +87,8 @@ describe ReservesController do
         response.should render_template("index")
       end
 
-      it "should get my index csv" do
-        get :index, :format => :csv
+      it "should get my index txt" do
+        get :index, :format => :txt
         response.should be_success
         response.should render_template("index")
       end
@@ -104,15 +104,15 @@ describe ReservesController do
           response.should redirect_to reserves_url(:format => :rss)
         end
 
-        it "should redirect to my reservation csv" do
-          get :index, :user_id => users(:user1).username, :format => 'csv'
-          response.should redirect_to reserves_url(:format => :csv)
+        it "should redirect to my reservation txt" do
+          get :index, :user_id => users(:user1).username, :format => 'txt'
+          response.should redirect_to reserves_url(:format => :txt)
         end
       end
 
       describe "When other user_id is specified" do
         before(:each) do
-          @user = FactoryGirl.create(:user)
+          @user = users(:user3)
         end
 
         it "should not get any reserve as @reserves" do
@@ -337,8 +337,8 @@ describe ReservesController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = {:user_number => users(:user1).user_number, :manifestation_id => 5}
-      @invalid_attrs = {:user_number => users(:user1).user_number, :manifestation_id => 'invalid'}
+      @attrs = {:user_number => users(:user1).profile.user_number, :manifestation_id => 5}
+      @invalid_attrs = {:user_number => users(:user1).profile.user_number, :manifestation_id => 'invalid'}
     end
 
     describe "When logged in as Administrator" do
@@ -372,19 +372,19 @@ describe ReservesController do
       end
 
       it "should not create reservation with past date" do
-        post :create, :reserve => {:user_number => users(:user1).user_number, :manifestation_id => 5, :expired_at => '1901-01-01'}
+        post :create, :reserve => {:user_number => users(:user1).profile.user_number, :manifestation_id => 5, :expired_at => '1901-01-01'}
         assigns(:reserve).should_not be_valid
         response.should be_success
       end
 
       it "should create other user's reserve" do
-        post :create, :reserve => {:user_number => users(:user1).user_number, :manifestation_id => 5}
+        post :create, :reserve => {:user_number => users(:user1).profile.user_number, :manifestation_id => 5}
         assigns(:reserve).expired_at.should be_truthy
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should not create reserve without manifestation_id" do
-        post :create, :reserve => {:user_number => users(:admin).user_number}
+        post :create, :reserve => {:user_number => users(:admin).profile.user_number}
         response.should be_success
       end
 
@@ -432,14 +432,14 @@ describe ReservesController do
       end
 
       it "should create other user's reserve" do
-        post :create, :reserve => {:user_number => users(:user1).user_number, :manifestation_id => 5}
+        post :create, :reserve => {:user_number => users(:user1).profile.user_number, :manifestation_id => 5}
         assigns(:reserve).should be_valid
         assigns(:reserve).expired_at.should be_truthy
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should not create reserve over reserve_limit" do
-        post :create, :reserve => {:user_number => users(:admin).user_number, :manifestation_id => 5}
+        post :create, :reserve => {:user_number => users(:admin).profile.user_number, :manifestation_id => 5}
         assigns(:reserve).errors[:base].include?(I18n.t('reserve.excessed_reservation_limit')).should be_truthy
       end
     end
@@ -475,7 +475,7 @@ describe ReservesController do
       end
 
       it "should not create other user's reservation" do
-        post :create, :reserve => {:user_number => users(:user2).user_number, :manifestation_id => 6}
+        post :create, :reserve => {:user_number => users(:user2).profile.user_number, :manifestation_id => 6}
         assigns(:reserve).expired_at.should be_nil
         response.should be_forbidden
       end
@@ -543,13 +543,13 @@ describe ReservesController do
       end
 
       it "should not update reserve without manifestation_id" do
-        put :update, :id => 1, :reserve => {:user_number => users(:admin).user_number, :manifestation_id => nil}
+        put :update, :id => 1, :reserve => {:user_number => users(:admin).profile.user_number, :manifestation_id => nil}
         assigns(:reserve).should_not be_valid
         response.should be_success
       end
   
       it "should update other user's reservation without user_id" do
-        put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}
+        put :update, :id => 3, :reserve => {:user_number => users(:user1).profile.user_number}
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
@@ -564,16 +564,16 @@ describe ReservesController do
         put :update, :id => 15, :reserve => {:item_identifier => '00021'}
         assigns(:reserve).should_not be_valid
         response.should be_success
-        assigns(:reserve).state.should eq 'requested'
-        reserves(:reserve_00014).state.should eq 'retained'
+        assigns(:reserve).current_state.should eq 'requested'
+        reserves(:reserve_00014).current_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
-        assigns(:reserve).state.should eq 'retained'
+        assigns(:reserve).current_state.should eq 'retained'
         response.should redirect_to reserve_url(assigns(:reserve))
-        reserves(:reserve_00014).state.should eq 'postponed'
+        reserves(:reserve_00014).current_state.should eq 'postponed'
       end
     end
 
@@ -606,21 +606,21 @@ describe ReservesController do
 
       it "should cancel other user's reservation" do
         old_message_requests_count = MessageRequest.count
-        put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}, :mode => 'cancel'
+        put :update, :id => 3, :reserve => {:user_number => users(:user1).profile.user_number}, :mode => 'cancel'
         flash[:notice].should eq I18n.t('reserve.reservation_was_canceled')
-        assigns(:reserve).state.should eq 'canceled'
+        assigns(:reserve).current_state.should eq 'canceled'
         MessageRequest.count.should eq old_message_requests_count + 2
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should update reserve without user_id" do
-        put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}
+        put :update, :id => 3, :reserve => {:user_number => users(:user1).profile.user_number}
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should update other user's reservation" do
-        put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}
+        put :update, :id => 3, :reserve => {:user_number => users(:user1).profile.user_number}
         assigns(:reserve).should be_valid
         response.should redirect_to reserve_url(assigns(:reserve))
       end
@@ -652,24 +652,24 @@ describe ReservesController do
         old_message_requests_count = MessageRequest.count
         put :update, :id => 3, :mode => 'cancel'
         flash[:notice].should eq I18n.t('reserve.reservation_was_canceled')
-        assigns(:reserve).state.should eq 'canceled'
+        assigns(:reserve).current_state.should eq 'canceled'
         MessageRequest.count.should eq old_message_requests_count + 2
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should update my reservation" do
-        put :update, :id => 3, :reserve => {:user_number => users(:user1).user_number}
+        put :update, :id => 3, :reserve => {:user_number => users(:user1).profile.user_number}
         flash[:notice].should eq I18n.t('controller.successfully_updated', :model => I18n.t('activerecord.models.reserve'))
         response.should redirect_to reserve_url(assigns(:reserve))
       end
 
       it "should not update other user's reservation" do
-        put :update, :id => 5, :reserve => {:user_number => users(:user2).user_number}
+        put :update, :id => 5, :reserve => {:user_number => users(:user2).profile.user_number}
         response.should be_forbidden
       end
   
       it "should not cancel other user's reservation" do
-        put :update, :id => 5, :reserve => {:user_number => users(:user1).user_number}, :mode => 'cancel'
+        put :update, :id => 5, :reserve => {:user_number => users(:user1).profile.user_number}, :mode => 'cancel'
         response.should be_forbidden
       end
     end

data/spec/controllers/use_restrictions_controller_spec.rb

@@ -15,7 +15,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all use_restrictions as @use_restrictions" do
         get :index
@@ -24,7 +24,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all use_restrictions as @use_restrictions" do
         get :index
@@ -33,7 +33,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should be forbidden" do
         get :index
@@ -53,7 +53,7 @@ describe UseRestrictionsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -63,7 +63,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -73,7 +73,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -93,7 +93,7 @@ describe UseRestrictionsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "should be forbidden" do
         get :new
@@ -103,7 +103,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should be forbidden" do
         get :new
@@ -113,7 +113,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should be forbidden" do
         get :new
@@ -133,7 +133,7 @@ describe UseRestrictionsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -143,7 +143,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -153,7 +153,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested use_restriction as @use_restriction" do
         use_restriction = FactoryGirl.create(:use_restriction)
@@ -178,7 +178,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
@@ -206,7 +206,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
@@ -234,7 +234,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created use_restriction as @use_restriction" do
@@ -296,7 +296,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested use_restriction" do
@@ -323,7 +323,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested use_restriction" do
@@ -346,7 +346,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested use_restriction" do
@@ -395,7 +395,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested use_restriction" do
         delete :destroy, :id => @use_restriction.id
@@ -408,7 +408,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested use_restriction" do
         delete :destroy, :id => @use_restriction.id
@@ -421,7 +421,7 @@ describe UseRestrictionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested use_restriction" do
         delete :destroy, :id => @use_restriction.id

data/spec/controllers/user_checkout_stats_controller_spec.rb

@@ -9,7 +9,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
@@ -18,7 +18,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
@@ -27,7 +27,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all user_checkout_stats as @user_checkout_stats" do
         get :index
@@ -45,7 +45,7 @@ describe UserCheckoutStatsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -55,7 +55,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -65,7 +65,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -85,7 +85,7 @@ describe UserCheckoutStatsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         get :new
@@ -94,7 +94,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         get :new
@@ -103,7 +103,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested user_checkout_stat as @user_checkout_stat" do
         get :new
@@ -123,7 +123,7 @@ describe UserCheckoutStatsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -133,7 +133,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -143,7 +143,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested user_checkout_stat as @user_checkout_stat" do
         user_checkout_stat = FactoryGirl.create(:user_checkout_stat)
@@ -168,7 +168,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created user_checkout_stat as @user_checkout_stat" do
@@ -196,7 +196,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created user_checkout_stat as @user_checkout_stat" do
@@ -224,7 +224,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created user_checkout_stat as @user_checkout_stat" do
@@ -286,7 +286,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested user_checkout_stat" do
@@ -308,7 +308,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested user_checkout_stat" do
@@ -336,7 +336,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested user_checkout_stat" do
@@ -385,7 +385,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested user_checkout_stat" do
         delete :destroy, :id => @user_checkout_stat.id
@@ -398,7 +398,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested user_checkout_stat" do
         delete :destroy, :id => @user_checkout_stat.id
@@ -411,7 +411,7 @@ describe UserCheckoutStatsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested user_checkout_stat" do
         delete :destroy, :id => @user_checkout_stat.id