minitest_to_rspec 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f9207756131c32b3622da37695b0da546d38749df1d22ae1f7d1daa1f1f1a5
-  data.tar.gz: dfb8bb34cd541ed7172822c98ce84db91bb7b99af0bd3f01d907da50a0472af1
+  metadata.gz: 0b6e110f3ca9c10dfbc0b55d64f91132df5367984b3b484b6fa5a12dc5fe63ca
+  data.tar.gz: dfbd9d42cdd3382f1abb9c84d6a9ac0b45e3aec4c9554203248efca6f01064b2
 SHA512:
-  metadata.gz: 45025ed9cdf045697a49d0571811fa14919ba91868044630de17f4436a0f1ffa32c6f172a9b8518eb7139dadce949798caa6a37828101303892d1055c3522001
-  data.tar.gz: 3ea95cd4da9200505c5c23bf072d084aa37d4994add74f8689e9766061046aa8a68ce6f66adb5c10d325143b3e73a878a86bafc5693088e5016fc4a4d01c7385
+  metadata.gz: 7ed6c1df443a56e96b11095962298660cc0826cf709c0c3be628bcc49cbcc8a918cbb12b6904c3bbe67b84b665e0c44db5c599e215ee44302330f14eca9bd317
+  data.tar.gz: 66d2051676eb5755589504a8b12f66990eccd37bdcb0e6755d4500e3f75857187479e78b46ed09ff155c5201331cb72dd2eea809542dbfcaa5fe467a8ea49b52

data/CHANGELOG.md

@@ -17,6 +17,23 @@ of [keepachangelog.com][2].
 
 - None
 
+## 0.13.0 (2018-10-18)
+
+### Breaking Changes
+
+- Removed `MinitestToRspec::VERSION`, please use `MinitestToRspec.gem_version`
+
+### Added
+
+- [#26](https://github.com/jaredbeck/minitest_to_rspec/pull/26) -
+  Support `Test::Unit::TestCase`
+- [#25](https://github.com/jaredbeck/minitest_to_rspec/pull/25) -
+  Support `assert_empty`, `assert_kind_of`, `assert_instance_of`
+
+### Fixed
+
+- None
+
 ## 0.12.0 (2018-03-11)
 
 ### Breaking Changes

data/lib/minitest_to_rspec/cli.rb

@@ -32,13 +32,7 @@ module MinitestToRspec
     attr_reader :source, :target
 
     def initialize(args)
-      opts = Trollop.options(args) do
-        version MinitestToRspec::VERSION
-        banner BANNER
-        opt :rails, OPT_RAILS, short: :none
-        opt :mocha, OPT_MOCHA, short: :none
-      end
-
+      opts = parse_args(args)
       @rails = opts[:rails]
       @mocha = opts[:mocha]
       case args.length
@@ -101,6 +95,15 @@ module MinitestToRspec
         .gsub(/_test.rb\Z/, '_spec.rb')
     end
 
+    def parse_args(args)
+      Trollop.options(args) do
+        version MinitestToRspec.gem_version.to_s
+        banner BANNER
+        opt :rails, OPT_RAILS, short: :none
+        opt :mocha, OPT_MOCHA, short: :none
+      end
+    end
+
     def read_source
       File.read(source)
     end

data/lib/minitest_to_rspec/input/model/klass.rb

@@ -45,6 +45,10 @@ module MinitestToRspec
           @_block ||= @exp[3..-1] || []
         end
 
+        def test_unit_test_case?
+          lineage?(parent, %i[Test Unit TestCase])
+        end
+
         def draper_test_case?
           lineage?(parent, %i[Draper TestCase])
         end
@@ -78,23 +82,24 @@ module MinitestToRspec
           active_support_test_case? ||
             action_controller_test_case? ||
             action_mailer_test_case? ||
+            test_unit_test_case? ||
             draper_test_case?
         end
 
         private
 
-        def ancestor_name(exp, index)
-          assert_sexp_type(:colon2, exp)
-          ancestor = exp[index + 1]
-          sexp_type?(:const, ancestor) ? ancestor[1] : ancestor
+        def ancestor_names(exp)
+          return [exp] if exp.is_a?(Symbol)
+
+          sexp_type?(:colon2, exp) || sexp_type?(:const, exp) ||
+            raise(TypeError, "Expected :const or :colon2, got #{exp.inspect}")
+
+          exp.sexp_body.flat_map { |entry| ancestor_names(entry) }
         end
 
         def lineage?(exp, names)
           assert_sexp_type(:colon2, exp)
-          exp.length == names.length + 1 &&
-            names.each_with_index.all? { |name, ix|
-              name.to_sym == ancestor_name(exp, ix).to_sym
-            }
+          ancestor_names(exp) == names
         end
       end
     end

data/lib/minitest_to_rspec/input/subprocessors/call.rb

@@ -55,10 +55,22 @@ module MinitestToRspec
           matcher(:be_nil)
         end
 
+        def be_empty
+          matcher(:be_empty)
+        end
+
         def be_truthy
           matcher(:be_truthy)
         end
 
+        def be_a(exp)
+          matcher(:be_a, exp)
+        end
+
+        def be_instance_of(exp)
+          matcher(:be_instance_of, exp)
+        end
+
         def call_to_question_mark?(exp)
           sexp_type?(:call, exp) && Model::Call.new(exp).question_mark_method?
         end
@@ -95,12 +107,28 @@ module MinitestToRspec
           expect_to_not(be_nil, @exp.arguments[0], true)
         end
 
+        def method_assert_empty
+          expect_to(be_empty, @exp.arguments[0], true)
+        end
+
         def method_assert_not_equal
           expected = @exp.arguments[0]
           calculated = @exp.arguments[1]
           expect_to_not(eq(expected), calculated, true)
         end
 
+        def method_assert_kind_of
+          expected = @exp.arguments[0]
+          calculated = @exp.arguments[1]
+          expect_to(be_a(expected), calculated, true)
+        end
+
+        def method_assert_instance_of
+          expected = @exp.arguments[0]
+          calculated = @exp.arguments[1]
+          expect_to(be_instance_of(expected), calculated, true)
+        end
+
         def method_expects
           if @exp.num_arguments == 1 &&
              %i[lit hash].include?(@exp.arguments.first.sexp_type)

data/lib/minitest_to_rspec/version.rb

@@ -2,9 +2,7 @@
 
 #:nodoc:
 module MinitestToRspec
-  VERSION = '0.12.0'
-
   def self.gem_version
-    ::Gem::Version.new(VERSION)
+    ::Gem::Version.new('0.13.0')
   end
 end

data/minitest_to_rspec.gemspec

@@ -6,7 +6,7 @@ require 'minitest_to_rspec/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'minitest_to_rspec'
-  spec.version = MinitestToRspec::VERSION
+  spec.version = MinitestToRspec.gem_version.to_s
   spec.executables << 'mt2rspec'
   spec.authors = ['Jared Beck']
   spec.email = ['jared@jaredbeck.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest_to_rspec
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby