enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/spec/fixtures/use_restrictions.yml

@@ -0,0 +1,92 @@
+--- 
+use_restriction_00001: 
+  name: Available For Supply Without Return  
+  display_name: Available For Supply Without Return
+  id: 1
+  position: 1
+  note: ""
+use_restriction_00002: 
+  name: In Library Use Only  
+  display_name: In Library Use Only
+  id: 2
+  position: 2
+  note: ""
+use_restriction_00003: 
+  name: Limited Circulation, Long Loan Period  
+  display_name: Limited Circulation, Long Loan Period
+  id: 3
+  position: 3
+  note: ""
+use_restriction_00004: 
+  name: Limited Circulation, Normal Loan Period  
+  display_name: Limited Circulation, Normal Loan Period
+  id: 4
+  position: 4
+  note: ""
+use_restriction_00005: 
+  name: Limited Circulation, Short Loan Period  
+  display_name: Limited Circulation, Short Loan Period
+  id: 5
+  position: 5
+  note: ""
+use_restriction_00006: 
+  name: No Reproduction  
+  display_name: No Reproduction
+  id: 6
+  position: 6
+  note: ""
+use_restriction_00007: 
+  name: Not For Loan  
+  display_name: Not For Loan
+  id: 7
+  position: 7
+  note: ""
+use_restriction_00008: 
+  name: Overnight Only  
+  display_name: Overnight Only
+  id: 8
+  position: 8
+  note: ""
+use_restriction_00009: 
+  name: Renewals Not Permitted  
+  display_name: Renewals Not Permitted
+  id: 9
+  position: 9
+  note: ""
+use_restriction_00010: 
+  name: Supervision Required  
+  display_name: Supervision Required
+  id: 10
+  position: 10
+  note: ""
+use_restriction_00011: 
+  name: Term Loan  
+  display_name: Term Loan
+  id: 11
+  position: 11
+  note: ""
+use_restriction_00012: 
+  name: Use Only In Controlled Access  
+  display_name: Use Only In Controlled Access
+  id: 12
+  position: 12
+  note: ""
+use_restriction_00013: 
+  name: User Signature Required  
+  display_name: User Signature Required
+  id: 13
+  position: 13
+  note: ""
+
+# == Schema Information
+#
+# Table name: use_restrictions
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/fixtures/user_checkout_stats.yml

@@ -0,0 +1,30 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  id: 1
+  start_date: 2008-12-15 18:43:02
+  end_date: 2008-12-16 18:43:02
+  note: MyText
+  state: pending
+
+two:
+  id: 2
+  start_date: 2008-12-15 18:43:02
+  end_date: 2008-12-16 18:43:02
+  note: MyText
+  state: pending
+
+# == Schema Information
+#
+# Table name: user_checkout_stats
+#
+#  id           :integer          not null, primary key
+#  start_date   :datetime
+#  end_date     :datetime
+#  note         :text
+#  state        :string(255)
+#  created_at   :datetime
+#  updated_at   :datetime
+#  started_at   :datetime
+#  completed_at :datetime
+#

data/spec/fixtures/user_export_files.yml

@@ -0,0 +1,26 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+user_export_file_00001:
+  id: 1
+  user_id: 1
+user_export_file_00002:
+  id: 2
+  user_id: 1
+user_export_file_00003:
+  id: 3
+  user_id: 1
+
+# == Schema Information
+#
+# Table name: user_export_files
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  user_export_file_name    :string(255)
+#  user_export_content_type :string(255)
+#  user_export_file_size    :integer
+#  user_export_updated_at   :datetime
+#  executed_at              :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#

data/spec/fixtures/user_group_has_checkout_types.yml

@@ -0,0 +1,110 @@
+--- 
+user_group_has_checkout_type_00001: 
+  checkout_type_id: 1
+  updated_at: 2007-12-23 03:13:08.107022 +09:00
+  checkout_limit: 3
+  reservation_limit: 2
+  user_group_id: 1
+  checkout_period: 0
+  checkout_renewal_limit: 1
+  id: 1
+  created_at: 2007-12-23 03:13:08.107022 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00002: 
+  checkout_type_id: 2
+  updated_at: 2007-12-23 03:13:15.620143 +09:00
+  checkout_limit: 3
+  reservation_limit: 2
+  user_group_id: 1
+  checkout_period: 10
+  checkout_renewal_limit: 1
+  id: 2
+  created_at: 2007-12-23 03:13:15.620143 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00003: 
+  checkout_type_id: 1
+  updated_at: 2007-12-23 03:13:23.416856 +09:00
+  checkout_limit: 3
+  reservation_limit: 2
+  user_group_id: 2
+  checkout_period: 21
+  checkout_renewal_limit: 1
+  id: 3
+  created_at: 2007-12-23 03:13:23.416856 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00004: 
+  checkout_type_id: 2
+  updated_at: 2007-12-23 03:13:29.880538 +09:00
+  checkout_limit: 3
+  reservation_limit: 2
+  user_group_id: 2
+  checkout_period: 21
+  checkout_renewal_limit: 1
+  id: 4
+  created_at: 2007-12-23 03:13:29.880538 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00005: 
+  checkout_type_id: 1
+  updated_at: 2007-12-23 03:13:37.440462 +09:00
+  checkout_limit: 3
+  reservation_limit: 3
+  user_group_id: 3
+  checkout_period: 14
+  checkout_renewal_limit: 1
+  id: 5
+  created_at: 2007-12-23 03:13:37.440462 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00006: 
+  checkout_type_id: 2
+  updated_at: 2007-12-23 03:13:46.312751 +09:00
+  checkout_limit: 3
+  reservation_limit: 3
+  user_group_id: 3
+  checkout_period: 7
+  checkout_renewal_limit: 1
+  id: 6
+  created_at: 2007-12-23 03:13:46.312751 +09:00
+  set_due_date_before_closing_day: false
+user_group_has_checkout_type_00007: 
+  checkout_type_id: 3
+  updated_at: 2007-12-23 03:13:46.312751 +09:00
+  checkout_limit: 3
+  reservation_limit: 3
+  user_group_id: 2
+  checkout_period: 3
+  checkout_renewal_limit: 1
+  id: 7
+  created_at: 2007-12-23 03:13:46.312751 +09:00
+  set_due_date_before_closing_day: true
+user_group_has_checkout_type_00008: 
+  checkout_type_id: 3
+  updated_at: 2007-12-23 03:13:46.312751 +09:00
+  checkout_limit: 3
+  reservation_limit: 3
+  user_group_id: 1
+  checkout_period: 3
+  checkout_renewal_limit: 1
+  id: 8
+  created_at: 2007-12-23 03:13:46.312751 +09:00
+  set_due_date_before_closing_day: true
+
+# == Schema Information
+#
+# Table name: user_group_has_checkout_types
+#
+#  id                              :integer          not null, primary key
+#  user_group_id                   :integer          not null
+#  checkout_type_id                :integer          not null
+#  checkout_limit                  :integer          default(0), not null
+#  checkout_period                 :integer          default(0), not null
+#  checkout_renewal_limit          :integer          default(0), not null
+#  reservation_limit               :integer          default(0), not null
+#  reservation_expired_period      :integer          default(7), not null
+#  set_due_date_before_closing_day :boolean          default(FALSE), not null
+#  fixed_due_date                  :datetime
+#  note                            :text
+#  position                        :integer
+#  created_at                      :datetime
+#  updated_at                      :datetime
+#  current_checkout_count          :integer
+#

data/spec/fixtures/user_import_files.yml

@@ -42,4 +42,6 @@ two:
 #  created_at               :datetime         not null
 #  updated_at               :datetime         not null
 #  user_encoding            :string(255)
+#  default_library_id       :integer
+#  default_user_group_id    :integer
 #

data/spec/fixtures/user_reserve_stats.yml

@@ -0,0 +1,30 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  id: 1
+  start_date: 2008-12-20 11:36:28
+  end_date: 2008-12-21 11:36:28
+  note: MyText
+  state: pending
+
+two:
+  id: 2
+  start_date: 2008-12-20 11:36:28
+  end_date: 2008-12-21 11:36:28
+  note: MyText
+  state: pending
+
+# == Schema Information
+#
+# Table name: user_reserve_stats
+#
+#  id           :integer          not null, primary key
+#  start_date   :datetime
+#  end_date     :datetime
+#  note         :text
+#  state        :string(255)
+#  created_at   :datetime
+#  updated_at   :datetime
+#  started_at   :datetime
+#  completed_at :datetime
+#

data/spec/fixtures/users.yml

@@ -1,151 +1,51 @@
 --- 
 admin: 
   updated_at: 2008-05-31 13:16:30.163731 +09:00
-  expired_at: 
   encrypted_password: $2a$10$vHohD1WflnTIqAa8zMkF9evwAgIZRw3XuR4d3bi29M.jph/MB/AJi
-  deleted_at: 
-  user_group_id: 2
   id: 1
-  note: 
   username: admin
-  library_id: 2
   email: tanabe@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:32.111941 +09:00
-  confirmed_at: 2007-11-19 16:58:32.111941 +09:00
-  required_role_id: 4
-  user_number: "00001"
-  locale: "ja"
 librarian1: 
   updated_at: 2008-05-31 12:41:16.337474 +09:00
-  expired_at: 
   encrypted_password: $2a$10$9O2VuTccN4gHq36ARg0QReSrb1D7WrBBhZZ759RM9moHbB0W5zCzS
-  deleted_at: 
-  user_group_id: 1
   id: 2
-  note: 
   username: librarian1
-  library_id: 1
   email: librarian1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:33.172441 +09:00
-  confirmed_at: 2007-11-19 16:58:33.172441 +09:00
-  required_role_id: 1
-  user_number: "00002"
-  locale: "ja"
 user1: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  expired_at: 
   encrypted_password: $2a$10$JthS59A0BNkDOoFpCXM0V.GhhffKaoWKbzpPahYp/vTFrOyM7h/uW
-  deleted_at: 
-  user_group_id: 1
   id: 3
-  note: 
   username: user1
-  library_id: 2
   email: user1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  confirmed_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00003"
-  locale: "ja"
 librarian2: 
   updated_at: 2008-05-31 12:42:23.340575 +09:00
-  expired_at: 
   encrypted_password: $2a$10$YmmTGrYQ1Ir6oc7wXnp.GuNeO1eYLoP3sv8wMSIrTdaGw2BPwRrpS
-  deleted_at: 
-  user_group_id: 1
   id: 4
-  note: 
   username: librarian2
-  library_id: 2
   email: librarian2@library.example.jp
   created_at: 2008-01-18 12:24:04.222344 +09:00
-  confirmed_at: 2008-01-18 12:24:04.222344 +09:00
-  required_role_id: 1
-  user_number: "00004"
-  locale: "ja"
 user2: 
   updated_at: 2008-05-31 12:42:44.711117 +09:00
-  expired_at: 
   encrypted_password: $2a$10$i7UjJhLVrJM/J7qaTwW39OXw1NiwowUEbtNHVDV0sqMLjX9.UO9ca
-  deleted_at: 
-  user_group_id: 1
   id: 5
-  note: 
   username: user2
-  library_id: 1
   email: user2@library.example.jp
   created_at: 2008-01-18 13:29:06.922728 +09:00
-  confirmed_at: 2008-01-18 13:29:06.922728 +09:00
-  required_role_id: 2
-#  user_number: '00005'
-  locale: "ja"
 user3: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  expired_at: <%= 1.day.ago %>
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  deleted_at: 
-  user_group_id: 1
   id: 6
-  note: 
   username: user3
-  library_id: 2
   email: user3@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00006"
-  locale: "ja"
 user4: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
-  expired_at: 
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
-  deleted_at: 
-  user_group_id: 1
   id: 7
-  note: 
   username: user4
-  library_id: 2
-  locked_at: <%= 1.day.ago %>
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
-  required_role_id: 3
-  user_number: "00007"
-  locale: "ja"
-# == Schema Information
-#
-# Table name: users
-#
-#  id                       :integer         not null, primary key
-#  email                    :string(255)     default(""), not null
-#  encrypted_password       :string(255)     default(""), not null
-#  reset_password_token     :string(255)
-#  reset_password_sent_at   :datetime
-#  remember_created_at      :datetime
-#  sign_in_count            :integer         default(0)
-#  current_sign_in_at       :datetime
-#  last_sign_in_at          :datetime
-#  current_sign_in_ip       :string(255)
-#  last_sign_in_ip          :string(255)
-#  confirmation_token       :string(255)
-#  confirmed_at             :datetime
-#  confirmation_sent_at     :datetime
-#  unconfirmed_email        :string(255)
-#  failed_attempts          :integer         default(0)
-#  unlock_token             :string(255)
-#  locked_at                :datetime
-#  authentication_token     :string(255)
-#  created_at               :datetime        not null
-#  updated_at               :datetime        not null
-#  deleted_at               :datetime
-#  username                 :string(255)     not null
-#  library_id               :integer         default(1), not null
-#  user_group_id            :integer         default(1), not null
-#  expired_at               :datetime
-#  required_role_id         :integer         default(1), not null
-#  note                     :text
-#  keyword_list             :text
-#  user_number              :string(255)
-#  state                    :string(255)
-#  locale                   :string(255)
-#  enju_access_key          :string(255)
-#
-
+  locked_at: <%= 1.day.ago %>

data/spec/models/profile_spec.rb

@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Profile do
+  #pending "add some examples to (or delete) #{__FILE__}"
+  fixtures :all
+
+  it 'should create a profile' do
+    FactoryGirl.create(:profile)
+  end
+
+  it 'should destroy a profile' do
+    profile = FactoryGirl.create(:profile)
+    profile.destroy.should be_truthy
+  end
+
+  it 'should not set expired_at if its user group does not have valid period' do
+    profile = FactoryGirl.create(:profile)
+    profile.expired_at.should be_nil
+  end
+
+  it 'should set expired_at if its user group has valid period' do
+    profile = FactoryGirl.build(:profile)
+    user_group = FactoryGirl.create(:user_group, :valid_period_for_new_user => 10)
+    user_group.profiles << profile
+    profile.user_group.valid_period_for_new_user.should eq 10
+    profile.expired_at.should eq 10.days.from_now.end_of_day
+  end
+
+  it "should create profile" do
+    profile = FactoryGirl.create(:profile)
+    assert !profile.new_record?, "#{profile.errors.full_messages.to_sentence}"
+  end
+
+  if defined?(EnjuQuestion)
+    it "should reset answer_feed_token" do
+      profiles(:user1).reset_answer_feed_token
+      profiles(:user1).answer_feed_token.should be_truthy
+    end
+
+    it "should delete answer_feed_token" do
+      profiles(:user1).delete_answer_feed_token
+      profiles(:user1).answer_feed_token.should be_nil
+    end
+  end
+
+  if defined?(EnjuCirculation)
+    it "should reset checkout_icalendar_token" do
+      profiles(:user1).reset_checkout_icalendar_token
+      profiles(:user1).checkout_icalendar_token.should be_truthy
+    end
+
+    it "should delete checkout_icalendar_token" do
+      profiles(:user1).delete_checkout_icalendar_token
+      profiles(:user1).checkout_icalendar_token.should be_nil
+    end
+  end
+
+  if defined?(EnjuCirculation)
+    it "should send_message" do
+      assert profiles(:librarian1).user.send_message('reservation_expired_for_patron', :manifestations => profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.collect(&:manifestation))
+      profiles(:librarian1).reload
+      profiles(:librarian1).user.reserves.not_sent_expiration_notice_to_patron.should be_empty
+    end
+  end
+end

data/spec/models/user_export_file_spec.rb

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+  
+describe UserExportFile do
+  fixtures :all
+  
+  it "should export in background" do
+    message_count = Message.count
+    file = UserExportFile.new
+    file.user = users(:admin)
+    file.save
+    UserExportFileQueue.perform(file.id).should be_truthy
+    Message.count.should eq message_count + 1
+    Message.order(:id).last.subject.should eq 'エクスポートが完了しました'
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_export_files
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  user_export_file_name    :string(255)
+#  user_export_content_type :string(255)
+#  user_export_file_size    :integer
+#  user_export_updated_at   :datetime
+#  executed_at              :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#

data/spec/models/user_import_file_spec.rb

@@ -7,6 +7,8 @@ describe UserImportFile do
   describe "when its mode is 'create'" do
     before(:each) do
       @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+      @file.default_user_group = UserGroup.find(2)
+      @file.default_library = Library.find(3)
       @file.user = users(:admin)
       @file.save
     end
@@ -21,39 +23,53 @@ describe UserImportFile do
       User.count.should eq old_users_count + 5
 
       user002 = User.where(:username => 'user002').first
-      user002.user_number.should eq '001002'
-      user002.user_group.name.should eq 'faculty'
-      user002.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
+      user002.profile.user_group.name.should eq 'faculty'
+      user002.profile.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
       user002.valid_password?('4NsxXPLy')
-      user002.user_number.should eq '001002'
-      user002.library.name.should eq 'web'
-      user002.locale.should eq 'en'
+      user002.profile.user_number.should eq '001002'
+      user002.profile.library.name.should eq 'hachioji'
+      user002.profile.locale.should eq 'en'
 
       user003 = User.where(:username => 'user003').first
-      user003.note.should eq 'テストユーザ'
+      user003.profile.note.should eq 'テストユーザ'
       user003.role.name.should eq 'Librarian'
-      user003.user_number.should eq '001003'
-      user003.library.name.should eq 'kamata'
-      user003.locale.should eq 'ja'
+      user003.profile.user_number.should eq '001003'
+      user003.profile.library.name.should eq 'kamata'
+      user003.profile.locale.should eq 'ja'
+      user003.profile.checkout_icalendar_token.should eq 'secrettoken'
+      user003.profile.save_checkout_history.should be_truthy
+      user003.profile.save_search_history.should be_falsy
+      user003.profile.share_bookmarks.should be_falsy
       User.where(:username => 'user000').first.should be_nil
       UserImportResult.count.should eq old_import_results_count + 6
 
-      user005 = User.where(username: 'user005').first
+      user005 = User.where(:username => 'user005').first
       user005.role.name.should eq 'User'
-      user005.library.name.should eq 'web'
-      user005.locale.should eq 'en'
-      user005.user_number.should eq '001005'
-      user005.user_group.name.should eq 'faculty'
+      user005.profile.library.name.should eq 'hachioji'
+      user005.profile.locale.should eq 'en'
+      user005.profile.user_number.should eq '001005'
+      user005.profile.user_group.name.should eq 'faculty'
 
-      user006 = User.where(username: 'user006').first
+      user006 = User.where(:username => 'user006').first
       user006.role.name.should eq 'User'
-      user006.library.name.should eq 'web'
-      user006.locale.should eq 'en'
-      user006.user_number.should be_nil
-      user006.user_group.name.should eq 'not_specified'
+      user006.profile.library.name.should eq 'hachioji'
+      user006.profile.locale.should eq 'en'
+      user006.profile.user_number.should be_nil
+      user006.profile.user_group.name.should eq UserGroup.find(2).name
 
       @file.user_import_fingerprint.should be_truthy
       @file.executed_at.should be_truthy
+
+      @file.reload
+      @file.error_message.should eq "The follwing column(s) were ignored: invalid"
+    end
+
+    it "should send message when import is completed" do
+      old_message_count = Message.count
+      @file.user = User.where(username: 'librarian1').first
+      @file.import_start
+      Message.count.should eq old_message_count + 1
+      Message.order(:id).last.subject.should eq 'インポートが完了しました'
     end
 
     it "should not import users that have higher roles than current user's role" do
@@ -77,6 +93,8 @@ describe UserImportFile do
     before(:each) do
       @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
       @file.user = users(:admin)
+      @file.default_user_group = UserGroup.find(2)
+      @file.default_library = Library.find(3)
       @file.save
       @file.import_start
     end
@@ -92,6 +110,8 @@ describe UserImportFile do
   it "should import in background" do
     file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
     file.user = users(:admin)
+    file.default_user_group = UserGroup.find(2)
+    file.default_library = Library.find(3)
     file.save
     UserImportFileQueue.perform(file.id).should be_truthy
   end
@@ -115,4 +135,6 @@ end
 #  created_at               :datetime         not null
 #  updated_at               :datetime         not null
 #  user_encoding            :string(255)
+#  default_library_id       :integer
+#  default_user_group_id    :integer
 #

data/spec/models/user_spec.rb

@@ -48,18 +48,6 @@ describe User do
     user.active_for_authentication?.should be_truthy
   end
 
-  it 'should not set expired_at if its user group does not have valid period' do
-    user = FactoryGirl.create(:user)
-    user.expired_at.should be_nil
-  end
-
-  it 'should not set expired_at if its user group does not have valid period' do
-    user = FactoryGirl.build(:user)
-    user.user_group = FactoryGirl.create(:user_group, :valid_period_for_new_user => 10)
-    user.save
-    user.expired_at.should eq 10.days.from_now.end_of_day
-  end
-
   it "should create user" do
     user = FactoryGirl.create(:user)
     assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
@@ -73,11 +61,6 @@ describe User do
     User.count.should eq old_count
   end
 
-  it "should not require user_number" do
-    user = FactoryGirl.create(:user, :user_number => nil)
-    user.errors[:user_number].should be_empty
-  end
-
   it "should require password" do
     user = FactoryGirl.build(:user, :password => nil)
     user.save
@@ -163,7 +146,7 @@ describe User do
     end
   end
 
-  if defined?(EnjuMessage)
+  if defined?(EnjuCirculation)
     it "should send_message" do
       assert users(:librarian1).send_message('reservation_expired_for_patron', :manifestations => users(:librarian1).reserves.not_sent_expiration_notice_to_patron.collect(&:manifestation))
       users(:librarian1).reload