test_xml 0.1.5 → 0.1.6

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.1.6
+
+* Fix dependencies so that Minitest doesn't rely on Test::Unit anymore. If you having trouble, update to minitest > 4.0.0 :)
+
 # 0.1.5
 
 * Make minitest-5 compatible.

data/lib/test_xml/assertions.rb

@@ -41,4 +41,27 @@ module TestXml
       :message_for_should_not => lambda { |a,b| "the xml:\n#{a}\nshould not exactly match xml structure:\n#{b} but it does" }
     )
   ]
+
+  module Assertions
+    ASSERTIONS.each do |cfg|
+      define_method(cfg.assert_name) do |a, b|
+        correct_assert(MatcherMethods.send(cfg.name, a, b), cfg.message_for_should.call(a, b))
+      end
+
+      define_method(cfg.assert_not_name) do |a, b|
+        correct_assert(! MatcherMethods.send(cfg.name, a, b), cfg.message_for_should_not.call(a, b))
+      end
+    end
+
+  private
+    def correct_assert(boolean, message)
+      if RUBY_VERSION =~ /1.9.2/ or defined?(MiniTest)
+        assert(boolean, message)
+      else
+        assert_block(message) do
+          boolean
+        end
+      end
+    end
+  end
 end

data/lib/test_xml/mini_test.rb

@@ -1,5 +1,4 @@
 require "test_xml"
-require "test_xml/test_unit"
 
 # TODO: should we remove test_xml/spec?
 MiniTest::Expectations.class_eval do
@@ -9,5 +8,5 @@ MiniTest::Expectations.class_eval do
 end
 
 class MiniTest::Test
-  include TestXml::TestUnit::Assertions
+  include TestXml::Assertions
 end

data/lib/test_xml/test_unit.rb

@@ -1,33 +1,6 @@
 require "test/unit"
 require "test_xml"
 
-module TestXml
-  module TestUnit
-    module Assertions
-      ASSERTIONS.each do |cfg|
-        define_method(cfg.assert_name) do |a, b|
-          correct_assert(MatcherMethods.send(cfg.name, a, b), cfg.message_for_should.call(a, b))
-        end
-
-        define_method(cfg.assert_not_name) do |a, b|
-          correct_assert(! MatcherMethods.send(cfg.name, a, b), cfg.message_for_should_not.call(a, b))
-        end
-      end
-
-    private
-      def correct_assert(boolean, message)
-        if RUBY_VERSION =~ /1.9.2/ or defined?(MiniTest)
-          assert(boolean, message)
-        else
-          assert_block(message) do
-            boolean
-          end
-        end
-      end
-    end
-  end
-end
-
 class Test::Unit::TestCase
-  include TestXml::TestUnit::Assertions
+  include TestXml::Assertions
 end

data/lib/test_xml/version.rb

@@ -1,3 +1,3 @@
 module TestXml
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_xml
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: