Fixing tests

app/models/card.rb

@@ -70,6 +70,10 @@ def isic?
     self.card_type == 'isic'
   end
 
+  def citylife?
+    self.card_type == 'citylife'
+  end
+
   # Renders the academic year in a more commonly used format
   def full_academic_year
     unless academic_year.blank?

app/models/club.rb

@@ -51,7 +51,7 @@ class Club < ActiveRecord::Base
   scope :with_internal_name, -> name { where('LOWER(internal_name) LIKE LOWER(?)', name ) }
 
   attr_accessible :description, :info_text, :confirmation_text,
-                  :registration_method, :uses_fk, :uses_isic, :isic_mail_option
+                  :registration_method, :uses_fk, :uses_isic, :uses_citylife, :isic_mail_option
 
   has_attached_file :export
   # Do not validate the export. We create it ourselves so we trust it

app/models/member.rb

@@ -101,6 +101,14 @@ def uses_isic?
     end
   end
 
+  def uses_citylife?
+    if self.current_card
+      self.current_card.citylife?
+    else
+      pick_card_type == 'citylife'
+    end
+  end
+
   # Handy defaults
   after_initialize :defaults
   def defaults