enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/spec/controllers/checkout_types_controller_spec.rb

@@ -9,7 +9,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
@@ -18,7 +18,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
@@ -27,7 +27,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all checkout_types as @checkout_types" do
         get :index
@@ -47,7 +47,7 @@ describe CheckoutTypesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -57,7 +57,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -67,7 +67,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -87,7 +87,7 @@ describe CheckoutTypesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkout_type as @checkout_type" do
         get :new
@@ -97,7 +97,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested checkout_type as @checkout_type" do
         get :new
@@ -107,7 +107,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested checkout_type as @checkout_type" do
         get :new
@@ -127,7 +127,7 @@ describe CheckoutTypesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -137,7 +137,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -147,7 +147,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested checkout_type as @checkout_type" do
         checkout_type = FactoryGirl.create(:checkout_type)
@@ -172,7 +172,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
@@ -200,7 +200,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
@@ -228,7 +228,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created checkout_type as @checkout_type" do
@@ -290,7 +290,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested checkout_type" do
@@ -317,7 +317,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested checkout_type" do
@@ -340,7 +340,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested checkout_type" do
@@ -389,7 +389,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested checkout_type" do
         delete :destroy, :id => @checkout_type.id
@@ -402,7 +402,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested checkout_type" do
         delete :destroy, :id => @checkout_type.id
@@ -415,7 +415,7 @@ describe CheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested checkout_type" do
         delete :destroy, :id => @checkout_type.id

data/spec/controllers/checkouts_controller_spec.rb

@@ -9,7 +9,7 @@ describe CheckoutsController do
     end
 
     before(:each) do
-      FactoryGirl.create(:admin)
+      FactoryGirl.create(:profile)
     end
 
     describe "When logged in as Administrator" do
@@ -35,8 +35,8 @@ describe CheckoutsController do
         response.should be_success
       end
 
-      it "should get index csv" do
-        get :index, :format => 'csv'
+      it "should get index txt" do
+        get :index, :format => 'txt'
         response.should be_success
       end
 
@@ -86,7 +86,7 @@ describe CheckoutsController do
       end
 
       it "should be forbidden if other's username is specified" do
-        user = FactoryGirl.create(:user)
+        user = users(:user3)
         get :index, :user_id => user.username
         assigns(:checkouts).should be_nil
         response.should be_forbidden
@@ -104,9 +104,9 @@ describe CheckoutsController do
         response.should redirect_to checkouts_url
       end
 
-      it "should get my index in csv format" do
-        get :index, :user_id => users(:user1).username, :format => 'csv'
-        response.should redirect_to checkouts_url(:format => :csv)
+      it "should get my index in txt format" do
+        get :index, :user_id => users(:user1).username, :format => 'txt'
+        response.should redirect_to checkouts_url(:format => :txt)
         assigns(:checkouts).should be_nil
       end
 
@@ -130,16 +130,16 @@ describe CheckoutsController do
       end
 
       it "assigns his own checkouts as @checkouts" do
-        token = "AVRjefcBcey6f1WyYXDl"
-        user = User.where(:checkout_icalendar_token => token).first
+        token = "577830b08ecf9c4c4333d599a57a6f44a7fe76c0"
+        user = Profile.where(:checkout_icalendar_token => token).first.user
         get :index, :icalendar_token => token
         assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC')
         response.should be_success
       end
 
       it "should get ics template" do
-        token = "AVRjefcBcey6f1WyYXDl"
-        user = User.where(:checkout_icalendar_token => token).first
+        token = "577830b08ecf9c4c4333d599a57a6f44a7fe76c0"
+        user = Profile.where(:checkout_icalendar_token => token).first.user
         get :index, :icalendar_token => token, :format => :ics
         assigns(:checkouts).should eq user.checkouts.not_returned.order('checkouts.id DESC')
         response.should be_success
@@ -432,7 +432,7 @@ describe CheckoutsController do
 
       it "redirects to the checkouts list" do
         delete :destroy, :id => @returned_checkout.id
-        response.should redirect_to(user_checkouts_url(@returned_checkout.user))
+        response.should redirect_to(checkouts_url(user_id: @returned_checkout.user.username))
       end
     end
 
@@ -450,7 +450,7 @@ describe CheckoutsController do
 
       it "redirects to the checkouts list" do
         delete :destroy, :id => @returned_checkout.id
-        response.should redirect_to(user_checkouts_url(@returned_checkout.user))
+        response.should redirect_to(checkouts_url(user_id: @returned_checkout.user.username))
       end
     end
 
@@ -468,7 +468,7 @@ describe CheckoutsController do
 
       it "should destroy my checkout" do
         delete :destroy, :id => 13
-        response.should redirect_to user_checkouts_url(users(:user1))
+        response.should redirect_to checkouts_url(user_id: users(:user1).username)
       end
     end
 

data/spec/controllers/circulation_statuses_controller_spec.rb

@@ -15,7 +15,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
@@ -24,7 +24,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
@@ -33,7 +33,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all circulation_statuses as @circulation_statuses" do
         get :index
@@ -51,7 +51,7 @@ describe CirculationStatusesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -61,7 +61,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -71,7 +71,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -91,7 +91,7 @@ describe CirculationStatusesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "should be forbidden" do
         get :new
@@ -101,7 +101,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should be forbidden" do
         get :new
@@ -111,7 +111,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should be forbidden" do
         get :new
@@ -131,7 +131,7 @@ describe CirculationStatusesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -141,7 +141,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -151,7 +151,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested circulation_status as @circulation_status" do
         circulation_status = FactoryGirl.create(:circulation_status)
@@ -176,7 +176,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created circulation_status as @circulation_status" do
@@ -204,7 +204,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created circulation_status as @circulation_status" do
@@ -232,7 +232,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created circulation_status as @circulation_status" do
@@ -294,7 +294,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested circulation_status" do
@@ -321,7 +321,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested circulation_status" do
@@ -344,7 +344,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested circulation_status" do
@@ -393,7 +393,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested circulation_status" do
         delete :destroy, :id => @circulation_status.id
@@ -406,7 +406,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested circulation_status" do
         delete :destroy, :id => @circulation_status.id
@@ -419,7 +419,7 @@ describe CirculationStatusesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested circulation_status" do
         delete :destroy, :id => @circulation_status.id

data/spec/controllers/item_has_use_restrictions_controller_spec.rb

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