aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-03-16 18:32:57 -0700
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-03-16 18:32:57 -0700
commit9771b2f3a3fdb45517a132228a1129718acd2fac (patch)
treedbb601356b174ff8fe31ec5dc28a12830c6b1a06
parentcae95fc02af1fff885dca4a29b2fd3711b809cab (diff)
downloadrails-9771b2f3a3fdb45517a132228a1129718acd2fac.tar.gz
rails-9771b2f3a3fdb45517a132228a1129718acd2fac.tar.bz2
rails-9771b2f3a3fdb45517a132228a1129718acd2fac.zip
test organization
-rw-r--r--spec/active_relation/unit/relations/join_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/active_relation/unit/relations/join_spec.rb b/spec/active_relation/unit/relations/join_spec.rb
index 515c9ce0f2..30ac73b611 100644
--- a/spec/active_relation/unit/relations/join_spec.rb
+++ b/spec/active_relation/unit/relations/join_spec.rb
@@ -77,12 +77,12 @@ module ActiveRelation
end
end
- describe 'with simple relations' do
+ describe 'when joining simple relations' do
describe '#attributes' do
it 'combines the attributes of the two relations' do
- simple_join = Join.new("INNER JOIN", @relation1, @relation2, @predicate)
- simple_join.attributes.should ==
- (@relation1.attributes + @relation2.attributes).collect { |a| a.bind(simple_join) }
+ join = Join.new("INNER JOIN", @relation1, @relation2, @predicate)
+ join.attributes.should ==
+ (@relation1.attributes + @relation2.attributes).collect { |a| a.bind(join) }
end
end