From 7ef2692de12738de4a340058ab7eeea6ffa2c3f8 Mon Sep 17 00:00:00 2001
From: James Urquhart <jamesu@gmail.com>
Date: Sat, 23 Apr 2011 21:27:10 +0100
Subject: [PATCH] Fix a few rails3 complaints

---
 app/controllers/application_controller.rb |  3 ---
 app/controllers/sessions_controller.rb    |  3 ---
 app/models/service.rb                     |  3 ++-
 app/models/user.rb                        |  5 ++--
 test/test_helper.rb                       | 33 +----------------------
 5 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b9f09ca..12aec5d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,9 +12,6 @@ class ApplicationController < ActionController::Base
   before_filter :login_required
   before_filter :set_time_zone
 
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password, :password_confirmation
-
 protected
 
   def error_status(error, message, args={}, continue_ok=true)
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 292cc6d..8422327 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -25,10 +25,7 @@
 
 # This controller handles the login/logout function of the site.  
 class SessionsController < ApplicationController
-  
   layout 'dialog'
-  
-  filter_parameter_logging :password
 
   # render new.rhtml
   def new
diff --git a/app/models/service.rb b/app/models/service.rb
index 22a4b91..f275100 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -6,8 +6,9 @@ class Service < ActiveRecord::Base
   
   attr :inherit_rate
   attr_accessible :name, :tag, :rate, :inherit_rate
+  after_initialize :set_inherit
   
-  def after_initialize
+  def set_inherit
     @inherit_rate = true
   end
   
diff --git a/app/models/user.rb b/app/models/user.rb
index a5dcfac..175ce9b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,5 @@
 class User < ActiveRecord::Base
   include Authentication
-  #include Authentication::ByPassword
   include Authentication::ByCookieToken
   
   has_many :projects,  :dependent => :destroy
@@ -14,7 +13,9 @@ class User < ActiveRecord::Base
   
   attr_accessible :email, :password, :password_confirmation, :timezone, :rate
   
-  def before_create
+  before_create :set_timezone
+  
+  def set_timezone
     self.timezone ||= "UTC"
   end
   
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b9fe251..da0a383 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,38 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require 'rails/test_help'
 
 class ActiveSupport::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually 
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
   fixtures :all
-
-  # Add more helper methods to be used by all tests here...
 end