Add some testcases:

[selectricity-live] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0907e68..cf7bba5
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -10,7 +10,7 @@ class Election < ActiveRecord::Base
   def startdate
     read_attribute( :startdate ) || Time.now
   end
   def startdate
     read_attribute( :startdate ) || Time.now
   end

-
+  

   def enddate
     date = read_attribute( :enddate ) || Time.now + 14
     date - 1.second
   def enddate
     date = read_attribute( :enddate ) || Time.now + 14
     date - 1.second


@@ -22,6 +22,14 @@ class Election < ActiveRecord::Base
     super(date)
   end
 
     super(date)
   end
 

+  def votes
+    votes = Array.new
+    self.voters.each do |voter|
+      votes << voter.vote
+    end
+    return votes
+  end
+

   def destroy
     self.candidates.each do |candidate|
       candidate.destroy
   def destroy
     self.candidates.each do |candidate|
       candidate.destroy


@@ -49,7 +57,7 @@ class Election < ActiveRecord::Base
   end
   
   def quickvote?
   end
   
   def quickvote?

-    quickvote.to_i == 1
+    type == 'QuickVote'

   end
 
   def active?
   end
 
   def active?