Merge jdong

[selectricity] / test / fixtures / candidates.yml

diff --git a/test/fixtures/candidates.yml b/test/fixtures/candidates.yml
old mode 100755 (executable)
new mode 100644 (file)
index 8794d28..4a651bf
--- a/test/fixtures/candidates.yml
+++ b/test/fixtures/candidates.yml
@@ -1,5 +1,31 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first:
-  id: 1
-another:
-  id: 2
+
+mika_normal:
+ id: 1
+ name: mika
+ election_id: 1
+
+mako_normal:
+ id: 2
+ name: mako 
+ election_id: 1
+
+bettamax_normal:
+ id: 3
+ name: bettamax
+ election_id: 1
+
+mika_badend:
+ id: 4
+ name: mika
+ election_id: 2
+
+mako_badend:
+ id: 5
+ name: mako 
+ election_id: 2
+
+bettamax_badend:
+ id: 6
+ name: bettamax
+ election_id: 2