From: Date: Wed, 5 Sep 2007 13:23:28 +0000 (-0400) Subject: turned off sitealizer by default to make things go online X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/b3d85db71fcbea2c22666804174b68e83563d8f6?hp=-c turned off sitealizer by default to make things go online --- b3d85db71fcbea2c22666804174b68e83563d8f6 diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 01722e6..a71d7b4 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -1,21 +1,19 @@ -# Filters added to this controller will be run for all controllers in -# the application. Likewise, all the methods added will be available -# for all controllers. +# Filters added to this controller will be run for all controllers in the application. +# Likewise, all the methods added will be available for all controllers. class ApplicationController < ActionController::Base - # add authentication methods and hooks include AuthenticatedSystem helper :user require_dependency "user" - # add sitealizer statistics and tracking information include Sitealizer - - before_filter :use_sitealizer, :add_stylesheets + before_filter :add_stylesheets + #before_filter :use_sitealizer def initialize @stylesheets = [] - + + # this is defined is a sketchy way in the sitealizer mixin # initalize. since i'm overloading that, i'm calling it here $visits = [] unless $visits diff --git a/test/functional/quickvote_controller_test.rb b/test/functional/quickvote_controller_test.rb index fbeb4a5..60ddb1b 100644 --- a/test/functional/quickvote_controller_test.rb +++ b/test/functional/quickvote_controller_test.rb @@ -60,7 +60,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase 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