allowing string passthrough for order clauses

1 files changed, 36 insertions, 6 deletions

diff --git a/spec/active_relation/unit/relations/order_spec.rb b/spec/active_relation/unit/relations/order_spec.rb
index 6a9ce07024..f37a9f26e9 100644
--- a/spec/active_relation/unit/relations/order_spec.rb
+++ b/spec/active_relation/unit/relations/order_spec.rb
@@ -22,12 +22,42 @@ module ActiveRelation
     end
   
     describe '#to_sql' do
-      it "manufactures sql with an order clause" do
-        Order.new(@relation, @attribute).to_sql.should be_like("
-          SELECT `users`.`id`, `users`.`name`
-          FROM `users`
-          ORDER BY `users`.`id`
-        ")
+      describe "when given an attribute" do
+        it "manufactures sql with an order clause populated by the attribute" do
+          Order.new(@relation, @attribute).to_sql.should be_like("
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users`
+            ORDER BY `users`.`id`
+          ")
+        end
+      end
+      
+      describe "when given multiple attributes" do
+        before do
+          @another_attribute = @relation[:name]
+        end
+        
+        it "manufactures sql with an order clause populated by comma-separated attributes" do
+          Order.new(@relation, @attribute, @another_attribute).to_sql.should be_like("
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users`
+            ORDER BY `users`.`id`, `users`.`name`
+          ")
+        end
+      end
+      
+      describe "when given a string" do
+        before do
+          @string = "asdf".bind(@relation)
+        end
+        
+        it "passes the string through to the order clause" do
+          Order.new(@relation, @string).to_sql.should be_like("
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users`
+            ORDER BY asdf
+          ")
+        end
       end
     end
   end