removing code complexity concerning attribute lookup.

1 files changed, 8 insertions, 10 deletions

diff --git a/spec/active_relation/relations/order_spec.rb b/spec/active_relation/relations/order_spec.rb
index 204558daec..12b9761431 100644
--- a/spec/active_relation/relations/order_spec.rb
+++ b/spec/active_relation/relations/order_spec.rb
@@ -3,25 +3,23 @@ require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 module ActiveRelation
   describe Order do
     before do
-      @relation1 = Table.new(:foo)
-      @relation2 = Table.new(:bar)
-      @attribute1 = @relation1[:id]
-      @attribute2 = @relation2[:id]
+      @relation = Table.new(:users)
+      @attribute = @relation[:id]
     end
 
     describe '#qualify' do
       it "distributes over the relation and attributes" do
-        Order.new(@relation1, @attribute1).qualify. \
-          should == Order.new(@relation1.qualify, @attribute1.qualify)
+        Order.new(@relation, @attribute).qualify. \
+          should == Order.new(@relation.qualify, @attribute.qualify)
       end
     end
   
     describe '#to_sql' do
       it "manufactures sql with an order clause" do
-        Order.new(@relation1, @attribute1).to_sql.should be_like("""
-          SELECT `foo`.`name`, `foo`.`id`
-          FROM `foo`
-          ORDER BY `foo`.`id`
+        Order.new(@relation, @attribute).to_sql.should be_like("""
+          SELECT `users`.`id`, `users`.`name`
+          FROM `users`
+          ORDER BY `users`.`id`
         """)
       end
     end