mack-orm 0.8.2 → 0.8.3

data/lib/mack-orm/test_extensions.rb

@@ -1,6 +1,3 @@
-require "test/unit"
-require 'spec'
-
 if Mack.env == "test"
   module Mack
     module Testing # :nodoc: 
@@ -8,9 +5,8 @@ if Mack.env == "test"
   end
 
   # Wrap it so we don't accidentally alias the run method n times and run out of db connections!
-  unless Mack::Testing.const_defined?("ORM_LOADED")
-    
-    ORM_LOADED = true
+  run_once do
+
     module Mack
       module Testing
         
@@ -54,26 +50,28 @@ if Mack.env == "test"
       end # Example
     end # Spec
   
-    module Test # :nodoc:
-      module Unit # :nodoc:
-        class TestCase # :nodoc:
-          include Mack::Testing
+    unless v1_9?
+      module Test # :nodoc:
+        module Unit # :nodoc:
+          class TestCase # :nodoc:
+            include Mack::Testing
   
-          # Let's alias the run method in the class above us so we can create a new one here
-          # but still reference it.
-          alias_instance_method :run, :mack_test_case_run # :nodoc:
+            # Let's alias the run method in the class above us so we can create a new one here
+            # but still reference it.
+            alias_instance_method :run, :mack_test_case_run # :nodoc:
   
-          # We need to wrap the run method so we can do things like
-          # run a cleanup method if it exists
-          def run(result, &progress_block) # :nodoc:
-            rollback_transaction do
-              mack_test_case_run(result, &progress_block)
+            # We need to wrap the run method so we can do things like
+            # run a cleanup method if it exists
+            def run(result, &progress_block) # :nodoc:
+              rollback_transaction do
+                mack_test_case_run(result, &progress_block)
+              end
             end
-          end
   
-        end # TestCase
-      end # Unit
-    end # Test
+          end # TestCase
+        end # Unit
+      end # Test
+    end
   
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-orm
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -05:00
+date: 2009-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: []