aboutsummaryrefslogtreecommitdiffstats
path: root/spec/arel
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-05-16 15:08:50 -0700
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-05-16 15:08:50 -0700
commitc96155c4fdd9a15eeca6e59ca3f35197d2ad3541 (patch)
tree5e06f45fcb96b7c8727a125b057bdd06638634a2 /spec/arel
parent131b106dc0c6b001a78f6f6656c52c49831b9c9d (diff)
downloadrails-c96155c4fdd9a15eeca6e59ca3f35197d2ad3541.tar.gz
rails-c96155c4fdd9a15eeca6e59ca3f35197d2ad3541.tar.bz2
rails-c96155c4fdd9a15eeca6e59ca3f35197d2ad3541.zip
custom matcher
Diffstat (limited to 'spec/arel')
-rw-r--r--spec/arel/integration/joins/with_adjacency_spec.rb40
1 files changed, 20 insertions, 20 deletions
diff --git a/spec/arel/integration/joins/with_adjacency_spec.rb b/spec/arel/integration/joins/with_adjacency_spec.rb
index e75ae3766e..4ffdf1f64f 100644
--- a/spec/arel/integration/joins/with_adjacency_spec.rb
+++ b/spec/arel/integration/joins/with_adjacency_spec.rb
@@ -92,33 +92,33 @@ module Arel
describe '[]' do
describe 'when given an attribute belonging to both sub-relations' do
it 'disambiguates the relation that serves as the ancestor to the attribute' do
- relation = @relation1.join(@relation2).on(@predicate)
- relation[@relation1[:id]].ancestor.should == @relation1[:id]
- relation[@relation2[:id]].ancestor.should == @relation2[:id]
+ @relation1 \
+ .join(@relation2) \
+ .on(@predicate) \
+ .should disambiguate_attributes(@relation1[:id], @relation2[:id])
end
- describe 'when the left relation is compound' do
+ describe 'when the left relation is extremely compound' do
it 'disambiguates the relation that serves as the ancestor to the attribute' do
- relation = @relation1 \
- .select(@predicate) \
- .select(@predicate) \
- .join(@relation2) \
- .on(@predicate)
- relation[@relation1[:id]].should be_descends_from(@relation1[:id])
- relation[@relation1[:id]].should_not be_descends_from(@relation2[:id])
+ @relation1 \
+ .select(@predicate) \
+ .select(@predicate) \
+ .join(@relation2) \
+ .on(@predicate) \
+ .should disambiguate_attributes(@relation1[:id], @relation2[:id])
end
end
- describe 'when the right relation is compound' do
+ describe 'when the right relation is extremely compound' do
it 'disambiguates the relation that serves as the ancestor to the attribute' do
- relation = @relation1 \
- .join( \
- @relation2 \
- .select(@predicate) \
- .select(@predicate) \
- .select(@predicate)) \
- .on(@predicate)
- relation[@relation2[:id]].should be_descends_from(@relation2[:id])
+ @relation1 \
+ .join( \
+ @relation2 \
+ .select(@predicate) \
+ .select(@predicate) \
+ .select(@predicate)) \
+ .on(@predicate) \
+ .should disambiguate_attributes(@relation1[:id], @relation2[:id])
end
end
end