aboutsummaryrefslogtreecommitdiffstats
path: root/spec/active_relation/unit/relations/relation_spec.rb
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-03-12 23:31:18 -0700
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-03-12 23:31:18 -0700
commitb1acebaaf0823c093853ade5700bbf5117b4f31a (patch)
treeafb68e6d23f032802854e396e5f988aa1642c4d3 /spec/active_relation/unit/relations/relation_spec.rb
parent2654c29bfdb2ccddfed8cceaaaba06e46892bdb9 (diff)
downloadrails-b1acebaaf0823c093853ade5700bbf5117b4f31a.tar.gz
rails-b1acebaaf0823c093853ade5700bbf5117b4f31a.tar.bz2
rails-b1acebaaf0823c093853ade5700bbf5117b4f31a.zip
- renamed scalar to value
- added better test coverage and documentation of binary spec #to_sql
Diffstat (limited to 'spec/active_relation/unit/relations/relation_spec.rb')
-rw-r--r--spec/active_relation/unit/relations/relation_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/active_relation/unit/relations/relation_spec.rb b/spec/active_relation/unit/relations/relation_spec.rb
index 5e434e52a6..b562ec2a2a 100644
--- a/spec/active_relation/unit/relations/relation_spec.rb
+++ b/spec/active_relation/unit/relations/relation_spec.rb
@@ -89,7 +89,7 @@ module ActiveRelation
end
it "accepts arbitrary strings" do
- @relation.select("arbitrary").should == Selection.new(@relation, Scalar.new("arbitrary", @relation))
+ @relation.select("arbitrary").should == Selection.new(@relation, Value.new("arbitrary", @relation))
end
end
@@ -145,7 +145,7 @@ module ActiveRelation
describe '#update' do
it 'manufactures an update relation' do
Session.start do
- assignments = {@relation[:name] => Scalar.new('bob', @relation)}
+ assignments = {@relation[:name] => Value.new('bob', @relation)}
mock(Session.new).update(Update.new(@relation, assignments.bind(@relation)))
@relation.update(assignments).should == @relation
end