Ensure Model.all.destroy! is paired auto-migrations to cleanup spec s…

…tate
datamapper · May 18, 2010 · 1964977 · 1964977
1 parent af68486
commit 1964977
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/spec/lib/serialization_method_shared_spec.rb b/spec/lib/serialization_method_shared_spec.rb
@@ -12,9 +12,7 @@
   end
 
   before(:each) do
-    Cow.all.destroy!
-    Planet.all.destroy!
-    FriendedPlanet.all.destroy!
+    DataMapper::Model.descendants.each { |model| model.all.destroy! }
   end
 
   it 'serializes an array of extended objects' do
@@ -57,9 +55,7 @@
   end
 
   before(:each) do
-    Cow.all.destroy!
-    Planet.all.destroy!
-    FriendedPlanet.all.destroy!
+    DataMapper::Model.descendants.each { |model| model.all.destroy! }
   end
 
   describe '(serializing single resources)' do
@@ -242,8 +238,12 @@
 
     describe "(multiple repositories)" do
       before(:all) do
-        QuanTum::Cat.auto_migrate!
-        DataMapper.repository(:alternate) { QuanTum::Cat.auto_migrate! }
+        [ :default, :alternate ].each do |repository_name|
+          DataMapper.repository(repository_name) do
+            QuanTum::Cat.auto_migrate!
+            QuanTum::Cat.all.destroy!
+          end
+        end
       end
 
       it "should use the repsoitory for the model" do

diff --git a/spec/public/to_csv_spec.rb b/spec/public/to_csv_spec.rb
@@ -47,8 +47,12 @@
 
       describe "multiple repositories" do
         before(:all) do
-          QuanTum::Cat.auto_migrate!
-          DataMapper.repository(:alternate){ QuanTum::Cat.auto_migrate! }
+          [ :default, :alternate ].each do |repository_name|
+            DataMapper.repository(repository_name) do
+              QuanTum::Cat.auto_migrate!
+              QuanTum::Cat.all.destroy!
+            end
+          end
         end
 
         it "should use the repsoitory for the model" do