expanding the test to include both type of order declaration

while declaring default_scope

Also added test for unscoped using block style with four different
combinations

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index a1e351b54e..e7db3d3423 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -1,4 +1,5 @@
 class Car < ActiveRecord::Base
+
   has_many :bulbs
   has_many :tyres
   has_many :engines
@@ -7,9 +8,15 @@ class Car < ActiveRecord::Base
   scope :incl_tyres, includes(:tyres)
   scope :incl_engines, includes(:engines)
 
-  default_scope :order => 'name desc'
-
   scope :order_using_new_style,  order('name asc')
   scope :order_using_old_style,  :order => 'name asc'
 
 end
+
+class CoolCar < Car
+  default_scope :order => 'name desc'
+end
+
+class FastCar < Car
+  default_scope order('name desc')
+end
diff --git a/activerecord/test/models/engine.rb b/activerecord/test/models/engine.rb
index 751c3f02d1..851ff8c22b 100644
--- a/activerecord/test/models/engine.rb
+++ b/activerecord/test/models/engine.rb
@@ -1,3 +1,4 @@
 class Engine < ActiveRecord::Base
   belongs_to :my_car, :class_name => 'Car', :foreign_key => 'car_id',  :counter_cache => :engines_count
 end
+