enju_library 0.1.0.pre33 → 0.1.0.pre34

data/spec/controllers/budget_types_controller_spec.rb

@@ -20,7 +20,7 @@ require 'spec_helper'
 
 describe BudgetTypesController do
   fixtures :all
-  login_admin
+  login_fixture_admin
 
   # This should return the minimal set of attributes required to create a valid
   # BudgetType. As you add validations to BudgetType, be sure to

data/spec/controllers/libraries_controller_spec.rb

@@ -9,7 +9,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all libraries as @libraries" do
         get :index
@@ -18,7 +18,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all libraries as @libraries" do
         get :index
@@ -27,7 +27,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all libraries as @libraries" do
         get :index
@@ -51,7 +51,7 @@ describe LibrariesController do
 
   describe "GET show", :solr => true do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested library as @library" do
         get :show, :id => 1
@@ -60,7 +60,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested library as @library" do
         get :show, :id => 1
@@ -69,7 +69,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested library as @library" do
         get :show, :id => 1
@@ -87,7 +87,7 @@ describe LibrariesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested library as @library" do
         get :new
@@ -96,7 +96,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested library as @library" do
         get :new
@@ -105,7 +105,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested library as @library" do
         get :new
@@ -125,7 +125,7 @@ describe LibrariesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested library as @library" do
         library = FactoryGirl.create(:library)
@@ -135,7 +135,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested library as @library" do
         library = FactoryGirl.create(:library)
@@ -145,7 +145,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested library as @library" do
         library = FactoryGirl.create(:library)
@@ -170,7 +170,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created library as @library" do
@@ -203,7 +203,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created library as @library" do
@@ -231,7 +231,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created library as @library" do
@@ -293,7 +293,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested library" do
@@ -320,7 +320,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested library" do
@@ -342,7 +342,7 @@ describe LibrariesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested library" do
@@ -391,7 +391,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as Administrator" do
-        login_admin
+        login_fixture_admin
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id
@@ -414,7 +414,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as Librarian" do
-        login_librarian
+        login_fixture_librarian
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id
@@ -427,7 +427,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as User" do
-        login_user
+        login_fixture_user
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id
@@ -458,7 +458,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as Administrator" do
-        login_admin
+        login_fixture_admin
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id
@@ -471,7 +471,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as Librarian" do
-        login_librarian
+        login_fixture_librarian
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id
@@ -484,7 +484,7 @@ describe LibrariesController do
       end
 
       describe "When logged in as User" do
-        login_user
+        login_fixture_user
 
         it "destroys the requested library" do
           delete :destroy, :id => @library.id

data/spec/controllers/library_groups_controller_spec.rb

@@ -5,7 +5,7 @@ describe LibraryGroupsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all library_groups as @library_groups" do
         get :index
@@ -24,7 +24,7 @@ describe LibraryGroupsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested library_group as @library_group" do
         get :show, :id => 1
@@ -43,7 +43,7 @@ describe LibraryGroupsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested library_group as @library_group" do
         library_group = LibraryGroup.find(1)
@@ -53,7 +53,7 @@ describe LibraryGroupsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested library_group as @library_group" do
         library_group = LibraryGroup.find(1)
@@ -63,7 +63,7 @@ describe LibraryGroupsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested library_group as @library_group" do
         library_group = LibraryGroup.find(1)
@@ -84,12 +84,12 @@ describe LibraryGroupsController do
   describe "PUT update" do
     before(:each) do
       @library_group = LibraryGroup.find(1)
-      @attrs = {:name => 'example', :email => 'library@example.jp'}
+      @attrs = {:name => 'example'}
       @invalid_attrs = {:name => ''}
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested library_group" do

data/spec/controllers/request_status_types_controller_spec.rb

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