diff options
Diffstat (limited to 'spec/algebra')
-rw-r--r-- | spec/algebra/unit/relations/relation_spec.rb | 12 | ||||
-rw-r--r-- | spec/algebra/unit/session/session_spec.rb | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/spec/algebra/unit/relations/relation_spec.rb b/spec/algebra/unit/relations/relation_spec.rb index a1d1793d92..be77c64b17 100644 --- a/spec/algebra/unit/relations/relation_spec.rb +++ b/spec/algebra/unit/relations/relation_spec.rb @@ -148,8 +148,8 @@ module Arel describe Relation::Operable::Writable do describe '#delete' do it 'manufactures a deletion relation' do - Session.start do - Session.new.should_receive(:delete).with(Deletion.new(@relation)) + Session.start do |s| + s.should_receive(:delete).with(Deletion.new(@relation)) @relation.delete end end @@ -157,9 +157,9 @@ module Arel describe '#insert' do it 'manufactures an insertion relation' do - Session.start do + Session.start do |s| record = { @relation[:name] => 'carl' } - Session.new.should_receive(:create).with(Insert.new(@relation, record)) + s.should_receive(:create).with(Insert.new(@relation, record)) @relation.insert(record) end end @@ -167,9 +167,9 @@ module Arel describe '#update' do it 'manufactures an update relation' do - Session.start do + Session.start do |s| assignments = { @relation[:name] => Value.new('bob', @relation) } - Session.new.should_receive(:update).with(Update.new(@relation, assignments)) + s.should_receive(:update).with(Update.new(@relation, assignments)) @relation.update(assignments) end end diff --git a/spec/algebra/unit/session/session_spec.rb b/spec/algebra/unit/session/session_spec.rb index 0553a140ec..421e3e3637 100644 --- a/spec/algebra/unit/session/session_spec.rb +++ b/spec/algebra/unit/session/session_spec.rb @@ -10,16 +10,16 @@ module Arel describe '::start' do describe '::instance' do it "it is a singleton within the started session" do - Session.start do - Session.new.should == Session.new + Session.start do |session| + Session.instance.should == session end end it "is a singleton across nested sessions" do - Session.start do - outside = Session.new - Session.start do - Session.new.should == outside + Session.start do |s1| + outside = Session.instance + Session.start do |s2| + Session.instance.should == outside end end end |