kotovalexarian-likes-github
/
database_cleaner
mirror of https://github.com/DatabaseCleaner/database_cleaner
1
0
Fork 0
Code Releases Activity

Removed merge lines.

This commit is contained in:
Ernesto Tagwerker 2014-10-14 14:40:29 -03:00
parent 61feda02e0
commit 84cabcaa4f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spec/database_cleaner/base_spec.rb
View File

@ -181,12 +181,8 @@ module DatabaseCleaner
describe "comparison" do describe "comparison" do
it "should be equal if orm, connection and strategy are the same" do it "should be equal if orm, connection and strategy are the same" do
<<<<<<< HEAD
strategy = double("strategy")
=======
strategy = mock("strategy") strategy = mock("strategy")
strategy.stub!(:to_ary => [strategy]) strategy.stub!(:to_ary => [strategy])
>>>>>>> bb3dce2558d2888ef581affb0de4d5e55118cd3d
one = DatabaseCleaner::Base.new(:active_record,:connection => :default) one = DatabaseCleaner::Base.new(:active_record,:connection => :default)
one.strategy = strategy one.strategy = strategy
@ -253,15 +249,11 @@ module DatabaseCleaner
end end
describe "strategy_db=" do describe "strategy_db=" do
<<<<<<< HEAD
let(:strategy) { double("strategy") }
=======
let(:strategy) { let(:strategy) {
mock("strategy").tap{|strategy| mock("strategy").tap{|strategy|
strategy.stub!(:to_ary => [strategy]) strategy.stub!(:to_ary => [strategy])
} }
} }
>>>>>>> bb3dce2558d2888ef581affb0de4d5e55118cd3d
before(:each) do before(:each) do
subject.strategy = strategy subject.strategy = strategy
@ -361,15 +353,11 @@ module DatabaseCleaner
end end
describe "strategy=" do describe "strategy=" do
<<<<<<< HEAD
let(:mock_strategy) { double("strategy") }
=======
let(:mock_strategy) { let(:mock_strategy) {
mock("strategy").tap{|strategy| mock("strategy").tap{|strategy|
strategy.stub!(:to_ary => [strategy]) strategy.stub!(:to_ary => [strategy])
} }
} }
>>>>>>> bb3dce2558d2888ef581affb0de4d5e55118cd3d
it "should proxy symbolised strategies to create_strategy" do it "should proxy symbolised strategies to create_strategy" do
subject.should_receive(:create_strategy).with(:symbol) subject.should_receive(:create_strategy).with(:symbol)
@ -409,13 +397,9 @@ module DatabaseCleaner
end end
it "returns the set strategy" do it "returns the set strategy" do
<<<<<<< HEAD
strategum = double("strategy")
=======
strategum = mock("strategy").tap{|strategy| strategum = mock("strategy").tap{|strategy|
strategy.stub!(:to_ary => [strategy]) strategy.stub!(:to_ary => [strategy])
} }
>>>>>>> bb3dce2558d2888ef581affb0de4d5e55118cd3d
subject.strategy = strategum subject.strategy = strategum
subject.strategy.should eq strategum subject.strategy.should eq strategum
end end