enju_library 0.1.0.pre33 → 0.1.0.pre34

data/spec/controllers/request_types_controller_spec.rb

@@ -15,7 +15,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all request_types as @request_types" do
         get :index
@@ -24,7 +24,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all request_types as @request_types" do
         get :index
@@ -33,7 +33,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign request_types as @request_types" do
         get :index
@@ -57,7 +57,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested request_type as @request_type" do
         get :show, :id => @request_type.id
@@ -66,7 +66,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested request_type as @request_type" do
         get :show, :id => @request_type.id
@@ -75,7 +75,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested request_type as @request_type" do
         get :show, :id => @request_type.id
@@ -93,7 +93,7 @@ describe RequestTypesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested request_type as @request_type" do
         get :new
@@ -103,7 +103,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested request_type as @request_type" do
         get :new
@@ -113,7 +113,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested request_type as @request_type" do
         get :new
@@ -137,7 +137,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested request_type as @request_type" do
         get :edit, :id => @request_type.id
@@ -146,7 +146,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested request_type as @request_type" do
         get :edit, :id => @request_type.id
@@ -155,7 +155,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested request_type as @request_type" do
         get :edit, :id => @request_type.id
@@ -178,7 +178,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created request_type as @request_type" do
@@ -206,7 +206,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created request_type as @request_type" do
@@ -234,7 +234,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created request_type as @request_type" do
@@ -296,7 +296,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested request_type" do
@@ -323,7 +323,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested request_type" do
@@ -346,7 +346,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested request_type" do
@@ -395,7 +395,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested request_type" do
         delete :destroy, :id => @request_type.id
@@ -408,7 +408,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested request_type" do
         delete :destroy, :id => @request_type.id
@@ -421,7 +421,7 @@ describe RequestTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested request_type" do
         delete :destroy, :id => @request_type.id

data/spec/controllers/search_engines_controller_spec.rb

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

data/spec/controllers/shelves_controller_spec.rb

@@ -13,7 +13,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all shelves as @shelves" do
         get :index
@@ -22,7 +22,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all shelves as @shelves" do
         get :index
@@ -31,7 +31,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all shelves as @shelves" do
         get :index
@@ -62,7 +62,7 @@ describe ShelvesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested shelf as @shelf" do
         get :show, :id => 1
@@ -80,7 +80,7 @@ describe ShelvesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested shelf as @shelf" do
         get :new
@@ -89,7 +89,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested shelf as @shelf" do
         get :new
@@ -98,7 +98,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested shelf as @shelf" do
         get :new
@@ -118,7 +118,7 @@ describe ShelvesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested shelf as @shelf" do
         shelf = FactoryGirl.create(:shelf)
@@ -128,7 +128,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested shelf as @shelf" do
         shelf = FactoryGirl.create(:shelf)
@@ -138,7 +138,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested shelf as @shelf" do
         shelf = FactoryGirl.create(:shelf)
@@ -163,7 +163,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created shelf as @shelf" do
@@ -191,7 +191,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created shelf as @shelf" do
@@ -219,7 +219,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created shelf as @shelf" do
@@ -281,7 +281,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested shelf" do
@@ -295,7 +295,7 @@ describe ShelvesController do
 
         it "moves its position when specified" do
           put :update, :id => @shelf.id, :shelf => @attrs, :move => 'lower'
-          response.should redirect_to(library_shelves_url(@shelf.library))
+          response.should redirect_to(shelves_url(library_id: @shelf.library_id))
         end
       end
 
@@ -308,7 +308,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested shelf" do
@@ -331,7 +331,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested shelf" do
@@ -380,7 +380,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested shelf" do
         delete :destroy, :id => @shelf.id
@@ -398,7 +398,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested shelf" do
         delete :destroy, :id => @shelf.id
@@ -411,7 +411,7 @@ describe ShelvesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested shelf" do
         delete :destroy, :id => @shelf.id