diff options
author | Bryan Helmkamp <bryan@brynary.com> | 2009-11-09 19:31:53 -0500 |
---|---|---|
committer | Bryan Helmkamp <bryan@brynary.com> | 2009-11-09 19:31:53 -0500 |
commit | 130188e67ce76e4ced60dc0331d2ac5bba6cdb74 (patch) | |
tree | c6f1aa715947b2810a2155e1b7a241e92b5579f8 | |
parent | 976999cb980eb47ac5f297de043e2ed55248c2a5 (diff) | |
download | rails-130188e67ce76e4ced60dc0331d2ac5bba6cdb74.tar.gz rails-130188e67ce76e4ced60dc0331d2ac5bba6cdb74.tar.bz2 rails-130188e67ce76e4ced60dc0331d2ac5bba6cdb74.zip |
Switch from rr to RSpec mocks. rr has issues on 1.9.2pre
-rw-r--r-- | spec/arel/algebra/unit/relations/relation_spec.rb | 6 | ||||
-rw-r--r-- | spec/arel/algebra/unit/session/session_spec.rb | 10 | ||||
-rw-r--r-- | spec/arel/engines/sql/unit/relations/table_spec.rb | 4 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/spec/arel/algebra/unit/relations/relation_spec.rb b/spec/arel/algebra/unit/relations/relation_spec.rb index 35ce8bf1fb..6bd7970e3f 100644 --- a/spec/arel/algebra/unit/relations/relation_spec.rb +++ b/spec/arel/algebra/unit/relations/relation_spec.rb @@ -150,7 +150,7 @@ module Arel describe '#delete' do it 'manufactures a deletion relation' do Session.start do - mock(Session.new).delete(Deletion.new(@relation)) + Session.new.should_receive(:delete).with(Deletion.new(@relation)) @relation.delete end end @@ -160,7 +160,7 @@ module Arel it 'manufactures an insertion relation' do Session.start do record = { @relation[:name] => 'carl' } - mock(Session.new).create(Insert.new(@relation, record)) + Session.new.should_receive(:create).with(Insert.new(@relation, record)) @relation.insert(record) end end @@ -170,7 +170,7 @@ module Arel it 'manufactures an update relation' do Session.start do assignments = { @relation[:name] => Value.new('bob', @relation) } - mock(Session.new).update(Update.new(@relation, assignments)) + Session.new.should_receive(:update).with(Update.new(@relation, assignments)) @relation.update(assignments) end end diff --git a/spec/arel/algebra/unit/session/session_spec.rb b/spec/arel/algebra/unit/session/session_spec.rb index 03aab6a03f..0553a140ec 100644 --- a/spec/arel/algebra/unit/session/session_spec.rb +++ b/spec/arel/algebra/unit/session/session_spec.rb @@ -40,19 +40,19 @@ module Arel describe '#create' do it "executes an insertion on the connection" do - mock(@insert).call + @insert.should_receive(:call) @session.create(@insert) end end describe '#read' do it "executes an selection on the connection" do - mock(@read).call + @read.should_receive(:call) @session.read(@read) end it "is memoized" do - mock(@read).call.once + @read.should_receive(:call).once @session.read(@read) @session.read(@read) end @@ -60,14 +60,14 @@ module Arel describe '#update' do it "executes an update on the connection" do - mock(@update).call + @update.should_receive(:call) @session.update(@update) end end describe '#delete' do it "executes a delete on the connection" do - mock(@delete).call + @delete.should_receive(:call) @session.delete(@delete) end end diff --git a/spec/arel/engines/sql/unit/relations/table_spec.rb b/spec/arel/engines/sql/unit/relations/table_spec.rb index 26b9364929..92e4549028 100644 --- a/spec/arel/engines/sql/unit/relations/table_spec.rb +++ b/spec/arel/engines/sql/unit/relations/table_spec.rb @@ -42,8 +42,8 @@ module Arel describe '#reset' do it "reloads columns from the database" do - lambda { stub(@relation.engine).columns { [] } }.should_not change { @relation.attributes } - lambda { @relation.reset }.should change { @relation.attributes } + lambda { @relation.engine.stub!(:columns => []) }.should_not change { @relation.attributes } + lambda { @relation.reset }.should change { @relation.attributes } end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7d61fc9120..6d99fa4038 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -48,7 +48,7 @@ Spec::Runner.configure do |config| config.include BeLikeMatcher, HashTheSameAsMatcher, DisambiguateAttributesMatcher config.include AdapterGuards config.include Check - config.mock_with :rr + config.before do Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base) end |