Skip to content

Commit

Permalink
Fix a few rails3 complaints
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesu committed Apr 23, 2011
1 parent 5e4e755 commit 7ef2692
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 41 deletions.
3 changes: 0 additions & 3 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion app/models/service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
class User < ActiveRecord::Base
include Authentication
#include Authentication::ByPassword
include Authentication::ByCookieToken

has_many :projects, :dependent => :destroy
Expand All @@ -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

Expand Down
33 changes: 1 addition & 32 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 7ef2692

Please sign in to comment.