Merge remote branch 'ernie/master'

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/engines/sql/unit/relations/having_spec.rb b/spec/engines/sql/unit/relations/having_spec.rb
index a7f2f0da96..931e8d0a06 100644
--- a/spec/engines/sql/unit/relations/having_spec.rb
+++ b/spec/engines/sql/unit/relations/having_spec.rb
@@ -39,7 +39,7 @@ module Arel
           end
         end
       end
-      
+
       describe 'when given two predicates' do
         it "manufactures sql with where clause conditions joined by AND" do
           sql = @relation.group(@relation[:department]).having("MIN(salary) > 1000", "MAX(salary) < 10000").to_sql
diff --git a/spec/shared/relation_spec.rb b/spec/shared/relation_spec.rb
index d6d0de1da4..a5a22edb7d 100644
--- a/spec/shared/relation_spec.rb
+++ b/spec/shared/relation_spec.rb
@@ -187,12 +187,12 @@ share_examples_for 'A Relation' do
         actual.should == @expected.reverse
       end
     end
-    
+
     describe "by two attributes in one call to #order" do
       before :all do
         @expected = @expected.sort_by { |e| [e[@relation[:name]], e[@relation[:age]]]}.map {|e| e[@relation[:id]]}
       end
-      
+
       it "can be specified as ascending order in one call to #order" do
         actual = []
         @relation.order(@relation[:name].asc, @relation[:age].asc).each { |r| actual << r[@relation[:id]] }