Fix custom assertions for Ruby 1.9

heimidal · Feb 2, 2010 · 188728e · 188728e
1 parent 0ae2fd6
commit 188728e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 = ActiveMerchant CHANGELOG
 
+* Fix custom assertions for Ruby 1.9 [cody]
 * Deprecate Money objects [cody]
 * Update JCB rejex to catch all valid PANs [pjhyett]
 * Remove old TransaXGateway constant [cody]

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -30,6 +30,8 @@ class SubclassGateway < SimpleTestGateway
 
 module ActiveMerchant
   module Assertions
+    AssertionClass = RUBY_VERSION > '1.9' ? MiniTest::Assertion : Test::Unit::AssertionFailedError
+
     def assert_field(field, value)
       clean_backtrace do 
         assert_equal value, @helper.fields[field]
@@ -92,10 +94,10 @@ def assert_not_valid(validateable)
 
     private
     def clean_backtrace(&block)
-      yield
-    rescue Test::Unit::AssertionFailedError => e
+      yield    
+    rescue AssertionClass => e
       path = File.expand_path(__FILE__)
-      raise Test::Unit::AssertionFailedError, e.message, e.backtrace.reject { |line| File.expand_path(line) =~ /#{path}/ }
+      raise AssertionClass, e.message, e.backtrace.reject { |line| File.expand_path(line) =~ /#{path}/ }
     end
   end