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 ee79b3f50444e3902211b3d72fd5b5b379ecf5de..fbeb4a53a0dadf20ae1cd50be68fc41208ec1098 100644 (file)
--- a/test/functional/quickvote_controller_test.rb
+++ b/test/functional/quickvote_controller_test.rb
@@ -43,19 +43,19 @@ class QuickvoteControllerTest < Test::Unit::TestCase
 
   def test_create_quickvote_badname
     post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "foobar"]})
 
   def test_create_quickvote_badname
     post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "foobar"]})

-    assert_template "quickvote/create"
+    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, {:candidate_names => ["foo", "bar", "bar",  "foobar"]})
   end
 
   def test_create_quickvote_dupe_candidate
     post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => ["foo", "bar", "bar",  "foobar"]})

-    assert_template "quickvote/create"
+    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, {:candidate_names => nil})
   end
   
   def test_create_quickvote_nil_candidate
     post(:create, {'commit' => "Create Quickvote", 'quickvote' => {'name' => "has a space", 'description' => "Foobar"}}, nil, {:candidate_names => nil})

-    assert_template "quickvote/create"
+    assert_template "quickvote/_create_sidebar"

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

-    assert_template "quickvote/create"
+    assert_template "quickvote/_create_sidebar"

   end
 
   def test_get_quickvote_nonexistent
   end
 
   def test_get_quickvote_nonexistent