Refactor EquipmentItem Model spec

Resolves #1610

app/models/equipment_item.rb

@@ -20,6 +20,18 @@ class EquipmentItem < ActiveRecord::Base
 
   searchable_on(:name, :serial)
 
+  def self.for_eq_model(model_id, source_objects)
+    # count the number of equipment items for a given
+    # model out of an array of source objects
+    # 0 queries
+
+    count = 0
+    source_objects.each do |o|
+      count += 1 if o.equipment_model_id == model_id
+    end
+    count
+  end
+
   def status
     if deleted? && deactivation_reason
       "Deactivated (#{deactivation_reason})"
@@ -41,18 +53,6 @@ def available?
     status == 'available'
   end
 
-  def self.for_eq_model(model_id, source_objects)
-    # count the number of equipment items for a given
-    # model out of an array of source objects
-    # 0 queries
-
-    count = 0
-    source_objects.each do |o|
-      count += 1 if o.equipment_model_id == model_id
-    end
-    count
-  end
-
   def make_reservation_notes(procedure_verb, reservation, handler, new_notes,
                              time)
     new_str = "#### #{reservation.md_link(procedure_verb.capitalize)} by "\

spec/factories/equipment_items.rb

@@ -11,7 +11,7 @@
     deactivation_reason nil
     notes ''
 
-    factory :deactivated do
+    factory :deactivated_item do
       deactivation_reason 'Because I can'
       deleted_at '2013-01-01 00:00:00'
     end