Merge jdong

[selectricity] / test / functional / quickvote_controller_test.rb

diff --git a/test/functional/quickvote_controller_test.rb b/test/functional/quickvote_controller_test.rb
index 02c133e1508c40c28d7fdd1443f1a916d9ccfa80..ee79b3f50444e3902211b3d72fd5b5b379ecf5de 100644 (file)
--- a/test/functional/quickvote_controller_test.rb
+++ b/test/functional/quickvote_controller_test.rb
@@ -28,7 +28,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
   end
 
   def test_create_quickvote
   end
 
   def test_create_quickvote

-    post(:create, {'commit' =>"Create Quickvote", 'quickvote' =>{'name' =>"variable", 'description' =>"Favorite variable."}}, nil, {:candlist=>["foo", "bar", "foobar"]})
+    post(:create, {'commit' =>"Create Quickvote", 'quickvote' =>{'name' =>"variable", 'description' =>"Favorite variable."}}, nil, {:candidate_names=>["foo", "bar", "foobar"]})

     assert_template "quickvote/success"
     get :index, { 'ident' => "variable"}
     assert_response :success
     assert_template "quickvote/success"
     get :index, { 'ident' => "variable"}
     assert_response :success


@@ -42,19 +42,19 @@ class QuickvoteControllerTest < Test::Unit::TestCase
   end
 
   def test_create_quickvote_badname
   end
 
   def test_create_quickvote_badname

-    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => ["foo", "bar", "foobar"]})
+    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "foobar"]})

     assert_template "quickvote/create"
   end
 
   def test_create_quickvote_dupe_candidate
     assert_template "quickvote/create"
   end
 
   def test_create_quickvote_dupe_candidate

-    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => ["foo", "bar", "bar",  "foobar"]})
+    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "bar",  "foobar"]})

     assert_template "quickvote/create"
   end
   
   def test_create_quickvote_nil_candidate
     assert_template "quickvote/create"
   end
   
   def test_create_quickvote_nil_candidate

-    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => nil})
+    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => nil})

     assert_template "quickvote/create"
     assert_template "quickvote/create"

-    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => []})
+    post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => []})

     assert_template "quickvote/create"
   end
 
     assert_template "quickvote/create"
   end
 


@@ -119,7 +119,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
     test_create_quickvote
     qv=QuickVote.ident_to_quickvote('variable')
     qv.description="<object>foo</object>"
     test_create_quickvote
     qv=QuickVote.ident_to_quickvote('variable')
     qv.description="<object>foo</object>"

-    qv.candidatelist = ["<object>foo", "bar<object>", "<foobar>"]
+    qv.candidate_names = ["<object>foo", "bar<object>", "<foobar>"]

     qv.save!
     get :index, { 'ident' => 'variable' }
     assert_response :success
     qv.save!
     get :index, { 'ident' => 'variable' }
     assert_response :success