Merge mako

diff --git a/test/functional/quickvote_controller_test.rb b/test/functional/quickvote_controller_test.rb
index d0b37d90c170891a78723739631300e12ec9c88a..f2b0c2c06c1ddff655fdd08e71c54e813df2472c 100644 (file)
--- a/test/functional/quickvote_controller_test.rb
+++ b/test/functional/quickvote_controller_test.rb
@@ -12,7 +12,11 @@ class QuickvoteControllerTest < Test::Unit::TestCase
   end
 
   # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_index
+    get :index
+    assert_response 302
+  end
+  def test_create_quickvote
+
   end
 end

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 69b93489364759d2d4de7bc89a8d8c66db52b20e..ad9f06cd9d8aa2b3f60abe8cca525d84b3be315e 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -12,7 +12,8 @@ class SiteControllerTest < Test::Unit::TestCase
   end
 
   # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_index
+    get :index
+    assert_response :success
   end
 end