merged in from code from the other master

[selectricity] / test / fixtures / elections.yml

diff --git a/test/fixtures/elections.yml b/test/fixtures/elections.yml
index 814540fcd314c7ede325fa4cde8a5c8f3237ccda..b90d221a2d5082267bf264115945c64ed54d98be 100644 (file)
--- a/test/fixtures/elections.yml
+++ b/test/fixtures/elections.yml
@@ -1,22 +1,33 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 quickvote_normal:
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 quickvote_normal:

-   id: 1
-   name: acetarium
-   description: who is the winner?
-   anonymous: 1
-   startdate: 2007-08-22 12:00:00
-   enddate: 2007-09-21 11:59:59
-   active: 1
-   type: QuickVote
-   election_method: ssd
+  id: 1
+  name: acetarium
+  description: who is the winner?
+  anonymous: 1
+  startdate: 2007-08-22 12:00:00
+  enddate: 2010-09-21 11:59:59
+  active: 1
+  type: QuickVote
+  election_method: ssd
+
+quickvote_bernie: 
+  id: 954
+  kiosk: 0
+  election_method: ssd
+  name: geekdomain
+  quickuser: "089f1ed263b01c73843b690799eddebb"
+  enddate: 2009-04-22 00:00:00
+  verifiable: 0
+  embed_custom_string: 
+  anonymous: 1
+  early_results: 0
+  authenticated: 1
+  type: QuickVote
+  user_id: 
+  notices: 0
+  description: Dominio per la mailing-list geek@
+  embeddable: 0
+  viewable: 0
+  startdate: 2009-03-17 04:37:28
+  active: 2

 
 

-quickvote_invalid_endtime:
-   id: 2
-   name: acetarium2
-   description: who is the winner?
-   anonymous: 1
-   startdate: 2007-08-22 12:00:00
-   enddate: 2003-09-21 11:59:59
-   active: 1
-   type: QuickVote
-   election_method: ssd