1 files changed, 8 insertions, 9 deletions
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index 6ff1329d8e..ac42f444e1 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -1,28 +1,27 @@
 class Car < ActiveRecord::Base
 
   has_many :bulbs
-  has_many :foo_bulbs, :class_name => "Bulb", :conditions => { :name => 'foo' }
-  has_many :frickinawesome_bulbs, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+  has_many :foo_bulbs, -> { where(:name => 'foo') }, :class_name => "Bulb"
+  has_many :frickinawesome_bulbs, -> { where :frickinawesome => true }, :class_name => "Bulb"
 
   has_one :bulb
-  has_one :frickinawesome_bulb, :class_name => "Bulb", :conditions => { :frickinawesome => true }
+  has_one :frickinawesome_bulb, -> { where :frickinawesome => true }, :class_name => "Bulb"
 
   has_many :tyres
   has_many :engines, :dependent => :destroy
   has_many :wheels, :as => :wheelable, :dependent => :destroy
 
-  scope :incl_tyres, includes(:tyres)
-  scope :incl_engines, includes(:engines)
+  scope :incl_tyres, -> { includes(:tyres) }
+  scope :incl_engines, -> { includes(:engines) }
 
-  scope :order_using_new_style,  order('name asc')
-  scope :order_using_old_style,  :order => 'name asc'
+  scope :order_using_new_style,  -> { order('name asc') }
 
 end
 
 class CoolCar < Car
-  default_scope :order => 'name desc'
+  default_scope { order('name desc') }
 end
 
 class FastCar < Car
-  default_scope :order => 'name desc'
+  default_scope { order('name desc') }
 end