kotovalexarian-likes-github/database_cleaner
1
0
Fork 0
mirror of https://github.com/DatabaseCleaner/database_cleaner synced 2023-03-27 23:22:03 -04:00
Code Releases Activity

Removed merge lines.

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