etest-unit 0.8.2 → 0.8.3

data/lib/etest-unit/version.rb

@@ -1,3 +1,3 @@
 module EtestUnit
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/lib/etest-unit.rb

@@ -35,18 +35,8 @@ module EtestUnit
         ActiveRecord::Base.transaction do
           begin
             set_log_level(old_log_level)
-
-            if defined?(Mocha)
-              mocha_setup
-            end
-          
             super(test, result)
           ensure
-            if defined?(Mocha)
-              mocha_verify
-              mocha_teardown
-            end
-
             set_log_level(Logger::ERROR)
             raise ActiveRecord::Rollback, "Rollback test transaction"
           end
@@ -55,12 +45,21 @@ module EtestUnit
         set_log_level(old_log_level)
       end
     end
-    
+
+    module MochaAdditions
+      def run_test(test, result)
+        test.mocha_setup
+        super(test, result)
+      ensure
+        test.mocha_verify
+        test.mocha_teardown
+      end
+    end
+
     def create
       suite = super
-      if defined?(::ActiveRecord)
-        suite.extend ActiveRecordAdditions
-      end
+      suite.extend ActiveRecordAdditions if defined?(::ActiveRecord)
+      suite.extend MochaAdditions if defined?(::Mocha)
       suite
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etest-unit
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1929617669401661542
+      hash: 4133727308211617544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Build your tests alongside your code.