added new tests and fixtures

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index e2f458d3e2afeed8eea48e44df290ed4b8c0b728..8ff6992d906468ba45e6c5bfea0afceeae3573e6 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,12 +17,20 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect 'voter/:action',
               :controller => 'voter',
 
   map.connect 'voter/:action',
               :controller => 'voter',

-              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder)/ }
+              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder|results)/ }
+
+  map.voteopen 'voter/open.:election_id',
+                   :controller => 'voter',
+                   :action => 'index'

 
   map.votepassword 'voter/:urlpassword',
                    :controller => 'voter',
                    :action => 'index'
 
 
   map.votepassword 'voter/:urlpassword',
                    :controller => 'voter',
                    :action => 'index'
 

+  map.kiosk_ready 'voter/kiosk_ready/:urlpassword',
+                  :controller => 'voter',
+                  :action => 'kiosk_ready'
+

   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }
   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }