From 3f55d33e530da1b5c454e0cfe920462d497649c8 Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Sat, 17 May 2008 11:59:03 -0700 Subject: simplificatin of attribute division --- spec/arel/integration/joins/with_aggregations_spec.rb | 4 ++++ spec/arel/unit/primitives/attribute_spec.rb | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'spec') diff --git a/spec/arel/integration/joins/with_aggregations_spec.rb b/spec/arel/integration/joins/with_aggregations_spec.rb index e6af920d32..b9cb4acc31 100644 --- a/spec/arel/integration/joins/with_aggregations_spec.rb +++ b/spec/arel/integration/joins/with_aggregations_spec.rb @@ -16,6 +16,10 @@ module Arel end describe '#attributes' do + it '' do + @relation1.join(@aggregation).on(@predicate)[@relation2[:user_id]].should_not be_nil + end + it 'it transforms aggregate expressions into attributes' do join_with_aggregation = Join.new("INNER JOIN", @relation1, @aggregation, @predicate) join_with_aggregation.attributes.should == diff --git a/spec/arel/unit/primitives/attribute_spec.rb b/spec/arel/unit/primitives/attribute_spec.rb index 7e0155f84d..34665b5adf 100644 --- a/spec/arel/unit/primitives/attribute_spec.rb +++ b/spec/arel/unit/primitives/attribute_spec.rb @@ -62,20 +62,13 @@ module Arel @doubly_aliased_relation = @aliased_relation.alias end - describe 'when dividing two identical attributes' do - it "returns 1.0" do - (@relation[:id] / @relation[:id]).should == 1.0 - (@aliased_relation[:id] / @aliased_relation[:id]).should == 1.0 - end - end - describe 'when dividing two unrelated attributes' do it "returns 0.0" do (@relation[:id] / @relation[:name]).should == 0.0 end end - describe 'when dividing two similar attributes' do + describe 'when dividing two matching attributes' do it 'returns a the highest score for the most similar attributes' do (@aliased_relation[:id] / @relation[:id]) \ .should == (@aliased_relation[:id] / @relation[:id]) -- cgit v1.2.3