X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/58fb91dde4b0a16c1a764dda66e31bc57565e41f..ac0692b4b5cebdc97c889d0cd6126a1f1e3d241d:/test/functional/quickvote_controller_test.rb
diff --git a/test/functional/quickvote_controller_test.rb b/test/functional/quickvote_controller_test.rb
index 02c133e..60ddb1b 100644
--- 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
- 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
@@ -42,25 +42,25 @@ class QuickvoteControllerTest < Test::Unit::TestCase
end
def test_create_quickvote_badname
- post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => ["foo", "bar", "foobar"]})
- assert_template "quickvote/create"
+ post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "foobar"]})
+ assert_template "quickvote/_create_sidebar"
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"]})
- assert_template "quickvote/create"
+ post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "bar", "foobar"]})
+ assert_template "quickvote/_create_sidebar"
end
def test_create_quickvote_nil_candidate
- post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => nil})
- assert_template "quickvote/create"
- post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candlist => []})
- assert_template "quickvote/create"
+ post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => nil})
+ assert_template "quickvote/_create_sidebar"
+ post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => []})
+ assert_template "quickvote/_create_sidebar"
end
def test_get_quickvote_nonexistent
get :index, { 'ident' => "idontexist" }
- assert_redirected_to :controller => 'site'
+ assert_redirected_to :controller => 'front'
end
def test_get_result_empty_vote
@@ -72,7 +72,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
def test_get_result_nonexistent
test_create_quickvote
get :results, { 'ident' => 'asdflaksdjf' }
- assert_redirected_to :controller => 'site'
+ assert_redirected_to :controller => 'front'
end
def test_get_result_with_a_vote
@@ -119,7 +119,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
test_create_quickvote
qv=QuickVote.ident_to_quickvote('variable')
qv.description=""
- qv.candidatelist = ["