minitest_to_rspec 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7af6cefcb0786c8e45326f8620a786ad8f2fe89
-  data.tar.gz: 67ca2d184a2ea2b98dda827c70e3a5fbaf44dfbe
+  metadata.gz: 265d35e67e77ee31bae7acc313f3968d07799e52
+  data.tar.gz: c7a5a26dfdb3d2e6275d702586ec319a125c5074
 SHA512:
-  metadata.gz: 71242e74b6d2c4801191aa11e85214c8ab28b2390e265a9b043c22b64fa05a9ff2e238164c601081a6c89a347e1ae8b840e27541d495fc81f132527f6820c613
-  data.tar.gz: d86f72884d87dba2b95b07132ab0e1a20ce463a4723056ff16c4292c0df2330bbc55e3552e45523521fff6e1ff99aa219b15d9a6f224fe798b8fe49c425a8205
+  metadata.gz: 7544fbb50ee02a275a0e9d8cda04d1d10b927a8431c7e99b1a2d1a5d60e497f8013e0b2915b9f45684ae160573df1a0b77e9db644bde40016f6dd1011d1becf7
+  data.tar.gz: fee5e6be9a7e20414b808c5a1f453a0bbea8c68cc5a01a7f50f3d53c3419d5494a8046e0a5485ee25c134e1753713700813c22cce4a1bca195eb0eeef90bc441

data/CHANGELOG.md

@@ -4,6 +4,19 @@ Change Log
 This project follows [semver 2.0.0][1] and the recommendations
 of [keepachangelog.com][2].
 
+0.6.0
+-----
+
+### Added
+- Converts
+  - Draper::TestCase
+  - ActionMailer::TestCase
+- Experimental
+  - mocha: once, twice
+- Switch from ruby2ruby to sexp2ruby
+  - Will have better output, e.g. ruby 1.9.3 hash syntax
+  - Upgrade to ruby_parser 3.7
+
 0.5.0
 -----
 

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in minitest_to_rspec.gemspec
 gemspec
+
+# Required runtime dep: trollop > f7009b45,
+# but gemspec does not support git :(
+gem 'trollop', github: "ManageIQ/trollop"

data/README.md

@@ -81,6 +81,8 @@ assert_nil                  |       |
 refute                      |       |
 refute_equal                |       |
 
+To do: assert_not_nil
+
 Supported Mocha
 ---------------
 
@@ -88,17 +90,19 @@ Mocha                 | Arity | Block | Notes
 --------------------- | ----- | ----- | -------
 [any_instance][29]    | 0     | n/a   |
 [expects][21]         | 1     | n/a   |
+[once][31]            | 0     | n/a   |
 [stub][19]            | 0,1,2 | no    |
 [stub_everything][18] | 0,1,2 | no    | Uses `as_null_object`, not the same.
 [stubs][20]           | 1     | n/a   |
+[twice][32]           | 0     | n/a   |
 
-Notably not supported yet: [at_least, once, never, raises, etc.][30]
+To do: [at_least, never, raises, etc.][30]
 
 Acknowledgements
 ----------------
 
-Uses [ruby_parser][14], [sexp_processor][15], and [ruby2ruby][16]
-by [Ryan Davis][17].
+This project would not be possible without [ruby_parser][14],
+[sexp_processor][15], and [ruby2ruby][16] by [Ryan Davis][17].
 
 [1]: https://travis-ci.org/jaredbeck/minitest_to_rspec.svg
 [2]: https://travis-ci.org/jaredbeck/minitest_to_rspec
@@ -130,3 +134,5 @@ by [Ryan Davis][17].
 [28]: http://gofreerange.com/mocha/docs/
 [29]: http://www.rubydoc.info/github/floehopper/mocha/Mocha/ClassMethods#any_instance-instance_method
 [30]: http://www.rubydoc.info/github/floehopper/mocha/Mocha/Expectation
+[31]: http://www.rubydoc.info/github/floehopper/mocha/Mocha/Expectation#once-instance_method
+[32]: http://www.rubydoc.info/github/floehopper/mocha/Mocha/Expectation#twice-instance_method

data/lib/minitest_to_rspec/cli.rb

@@ -1,13 +1,6 @@
 require "minitest_to_rspec"
 require "trollop"
 
-# https://github.com/ManageIQ/trollop/issues/57
-module Trollop
-  def self.educate_without_exiting
-    @last_parser.educate($stderr)
-  end
-end
-
 module MinitestToRspec
   class CLI
     E_USAGE               = 1.freeze
@@ -33,7 +26,10 @@ EOS
     attr_reader :rails, :source, :target
 
     def initialize(args)
+      assert_trollop_version
+
       opts = Trollop::options(args) do
+        educate_on_error
         version MinitestToRspec::VERSION
         banner BANNER
         opt :rails, OPT_RAILS, short: :none
@@ -47,8 +43,7 @@ EOS
         @source = args[0]
         @target = infer_target_from @source
       else
-        Trollop.educate_without_exiting
-        exit(E_USAGE)
+        Trollop.die("Please specify source file", nil, E_USAGE)
       end
     end
 
@@ -77,6 +72,17 @@ EOS
       end
     end
 
+    # Temporary assertion. It would be nice if gemspec supported git.
+    def assert_trollop_version
+      unless Trollop.method(:die).arity == -2
+        warn "Please use trollop version f7009b45 or greater."
+        warn "This manual version constraint will be removed when"
+        warn "https://github.com/ManageIQ/trollop/pull/63"
+        warn "is included in an official trollop release."
+        exit(-1)
+      end
+    end
+
     def converter
       Converter.new(rails: rails)
     end

data/lib/minitest_to_rspec/converter.rb

@@ -1,5 +1,5 @@
 require "ruby_parser"
-require "ruby2ruby"
+require "sexp2ruby"
 require_relative "processor"
 require_relative "errors"
 
@@ -16,28 +16,8 @@ module MinitestToRspec
 
     private
 
-    # Parses an input string using the `ruby_parser` gem, and
-    # returns an Abstract Syntax Tree (AST) in the form of
-    # S-expressions.
-    #
-    # Example of AST
-    # --------------
-    #
-    # s(:block,
-    #   s(:call, nil, :require, s(:str, "test_helper")),
-    #   s(:class,
-    #     :BananaTest,
-    #     s(:colon2, s(:const, :ActiveSupport), :TestCase),
-    #     s(:iter,
-    #       s(:call, nil, :test, s(:str, "is delicious")),
-    #       s(:args),
-    #       s(:call, nil, :assert,
-    #         s(:call, s(:call, s(:const, :Banana), :new), :delicious?)
-    #       )
-    #     )
-    #   )
-    # )
-    #
+    # Parses input string and returns Abstract Syntax Tree (AST)
+    # as an S-expression.
     def parse(input)
       RubyParser.new.parse(input)
     end
@@ -52,15 +32,11 @@ module MinitestToRspec
     # Given an AST representing an rspec file, returns a string
     # of ruby code.
     def render(exp)
-      ruby2ruby.process(exp)
+      renderer.process(exp)
     end
 
-    # Try to specify ruby 1.9 hash_syntax if ruby2ruby supports it.
-    # https://github.com/seattlerb/ruby2ruby/pull/37
-    def ruby2ruby
-      Ruby2Ruby.new(hash_syntax: :ruby19)
-    rescue ArgumentError
-      Ruby2Ruby.new
+    def renderer
+      Sexp2Ruby::Processor.new(hash_syntax: :ruby19)
     end
   end
 end

data/lib/minitest_to_rspec/exp/call.rb

@@ -94,6 +94,23 @@ module MinitestToRspec
         @exp[1]
       end
 
+      # While `#receiver` returns a `Sexp`, `#receiver_call`
+      # returns a `Exp::Call`.
+      def receiver_call
+        if sexp_type?(:call, receiver)
+          rvc = Exp::Call.new(receiver)
+
+          # TODO: Seems like a factory pattern
+          if rvc.method_name == :returns
+            Exp::Calls::Returns.new(receiver)
+          else
+            rvc
+          end
+        else
+          raise TypeError
+        end
+      end
+
       def require_test_helper?
         method_name == :require &&
           one_string_argument? &&

data/lib/minitest_to_rspec/exp/calls/once.rb

@@ -0,0 +1,11 @@
+require_relative "../call"
+require_relative "../../errors"
+
+module MinitestToRspec
+  module Exp
+    module Calls
+      class Once < Call
+      end
+    end
+  end
+end

data/lib/minitest_to_rspec/exp/calls/returns.rb

@@ -65,14 +65,6 @@ module MinitestToRspec
         def values
           arguments
         end
-
-        private
-
-        # The receiver of the `:returns` message is a `:call`
-        # either to `#stubs` or `#expects`.
-        def receiver_call
-          Call.new(receiver)
-        end
       end
     end
   end

data/lib/minitest_to_rspec/exp/calls/twice.rb

@@ -0,0 +1,11 @@
+require_relative "../call"
+require_relative "../../errors"
+
+module MinitestToRspec
+  module Exp
+    module Calls
+      class Twice < Call
+      end
+    end
+  end
+end

data/lib/minitest_to_rspec/exp/klass.rb

@@ -15,6 +15,10 @@ module MinitestToRspec
         lineage?(parent, [:ActionController, :TestCase])
       end
 
+      def action_mailer_test_case?
+        lineage?(parent, [:ActionMailer, :TestCase])
+      end
+
       def active_support_test_case?
         lineage?(parent, [:ActiveSupport, :TestCase])
       end
@@ -39,6 +43,10 @@ module MinitestToRspec
         @_block ||= @exp[3..-1] || []
       end
 
+      def draper_test_case?
+        lineage?(parent, [:Draper, :TestCase])
+      end
+
       # Returns the name of the class.  Examples:
       #
       # - Banana #=> :Banana
@@ -66,7 +74,9 @@ module MinitestToRspec
       def test_case?
         return false unless sexp_type?(:colon2, parent)
         active_support_test_case? ||
-          action_controller_test_case?
+          action_controller_test_case? ||
+          action_mailer_test_case? ||
+          draper_test_case?
       end
 
       private

data/lib/minitest_to_rspec/subprocessors/base.rb

@@ -47,7 +47,7 @@ module MinitestToRspec
       def expectation_target_lazy(block)
         s(:iter,
           s(:call, nil, :expect),
-          s(:args),
+          0,
           full_process(block)
         )
       end

data/lib/minitest_to_rspec/subprocessors/call.rb

@@ -31,6 +31,15 @@ module MinitestToRspec
         allow_to(msg_rcp, receive_and_return(msg, ret_vals), any_ins)
       end
 
+      # Given `exp`, an S-expression representing an rspec-mocks statement
+      # (expect or allow) apply `ordinal`, which is either `:once` or `:twice`.
+      # This feels like a hack.  No other processing "re-opens" an "output
+      # sexp".
+      def apply_expectation_count_to(exp, ordinal)
+        exp[3] = s(:call, exp[3], ordinal)
+        exp
+      end
+
       def be_falsey
         matcher(:be_falsey)
       end
@@ -98,12 +107,16 @@ module MinitestToRspec
 
       def method_expects
         if @exp.num_arguments == 1
-          mocha_expects
+          mocha_expects(@exp)
         else
           @exp.original
         end
       end
 
+      def method_once
+        mocha_once(@exp)
+      end
+
       def method_refute
         expect_to(be_falsey, @exp.arguments[0], true)
       end
@@ -136,11 +149,7 @@ module MinitestToRspec
       # - (name, stubs)
 
       def method_stub
-        if @exp.receiver.nil?
-          s(:call, nil, :double, *@exp.arguments)
-        else
-          @exp.original
-        end
+        mocha_stub(@exp)
       end
 
       # [stub_everything][1] responds to all messages with nil.
@@ -162,30 +171,53 @@ module MinitestToRspec
         s(:call, nil, :it, *@exp.arguments)
       end
 
-      def mocha_expects
-        arg = @exp.arguments.first
+      def method_twice
+        mocha_twice(@exp)
+      end
+
+      def mocha_expects(exp)
+        raise ArgumentError unless exp.is_a?(Exp::Call)
+        arg = exp.arguments.first
         if sexp_type?(:hash, arg)
-          mocha_expects_hash(arg)
+          mocha_expects_hash(exp, arg)
         elsif sexp_type?(:lit, arg)
-          mocha_expects_lit(arg)
+          mocha_expects_lit(exp, arg)
         else
-          @exp.original
+          exp.original
         end
       end
 
-      def mocha_expects_hash(hash_sexp)
+      def mocha_expects_hash(exp, hash_sexp)
         assert_sexp_type(:hash, hash_sexp)
-        pointless_lambda(hash_to_expectations(hash_sexp, @exp.receiver))
+        pointless_lambda(hash_to_expectations(hash_sexp, exp.receiver))
       end
 
-      def mocha_expects_lit(lit_sexp)
+      def mocha_expects_lit(exp, lit_sexp)
         assert_sexp_type(:lit, lit_sexp)
-        expect_to(receive_and_call_original(lit_sexp), @exp.receiver, true)
+        expect_to(receive_and_call_original(lit_sexp), exp.receiver, true)
+      end
+
+      def mocha_expectation_count(exp, ordinal)
+        raise ArgumentError unless exp.is_a?(Exp::Call)
+        raise ArgumentError unless %i[once twice].include?(ordinal)
+        rvc = exp.receiver_call
+        receiver_processing_method = "mocha_#{rvc.method_name}".to_sym
+        if respond_to?(receiver_processing_method, true)
+          x = send(receiver_processing_method, rvc)
+          apply_expectation_count_to(x, ordinal)
+        else
+          exp.original
+        end
+      end
+
+      def mocha_once(exp)
+        mocha_expectation_count(exp, :once)
       end
 
       # Given `r`, a `Exp::Calls::Returns`, return a `Sexp` representing
       # the equivalent stub or message expectation in RSpec.
       def mocha_returns(r)
+        raise ArgumentError unless r.is_a?(Exp::Calls::Returns)
         subprocessor_method = "#{r.rspec_mocks_method}_receive_and_return"
         send(subprocessor_method,
           r.rspec_msg_recipient,
@@ -195,6 +227,19 @@ module MinitestToRspec
         )
       end
 
+      def mocha_stub(exp)
+        raise ArgumentError unless exp.is_a?(Exp::Call)
+        if exp.receiver.nil?
+          s(:call, nil, :double, *exp.arguments)
+        else
+          exp.original
+        end
+      end
+
+      def mocha_twice(exp)
+        mocha_expectation_count(exp, :twice)
+      end
+
       def name_of_processing_method
         "method_#{@exp.method_name}".to_sym
       end
@@ -220,7 +265,7 @@ module MinitestToRspec
         s(:call,
           s(:iter,
             s(:call, nil, :lambda),
-            s(:args),
+            0,
             s(:block,
               s(:str, "Sorry for the pointless lambda here."),
               *array_of_calls

data/lib/minitest_to_rspec/subprocessors/iter.rb

@@ -33,7 +33,7 @@ module MinitestToRspec
       def matcher_with_block(matcher_name, block)
         s(:iter,
           s(:call, nil, matcher_name),
-          s(:args),
+          0,
           block
         )
       end

data/lib/minitest_to_rspec/subprocessors/klass.rb

@@ -17,7 +17,12 @@ module MinitestToRspec
 
       def process
         sexp = head
-        sexp << block if @exp.block?
+        ebk = @exp.block
+        if ebk.length > 1
+          sexp << block
+        elsif ebk.length == 1
+          sexp << full_process(ebk[0])
+        end
         sexp
       end
 
@@ -66,6 +71,10 @@ module MinitestToRspec
       def rdm_type
         if @exp.action_controller_test_case?
           :controller
+        elsif @exp.draper_test_case?
+          :decorator
+        elsif @exp.action_mailer_test_case?
+          :mailer
         else
           :model
         end
@@ -80,7 +89,7 @@ module MinitestToRspec
 
       # Returns a S-expression representing a call to RSpec.describe
       def rspec_describe_block
-        s(:iter, rspec_describe, s(:args))
+        s(:iter, rspec_describe, 0)
       end
     end
   end

data/lib/minitest_to_rspec/version.rb

@@ -1,3 +1,3 @@
 module MinitestToRspec
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

data/minitest_to_rspec.gemspec

@@ -25,9 +25,12 @@ ruby2ruby.
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.0.0"
 
-  spec.add_runtime_dependency "ruby_parser", "~> 3.6"
-  spec.add_runtime_dependency "ruby2ruby", "~> 2.1"
-  spec.add_runtime_dependency "trollop", "~> 2.1"
+  spec.add_runtime_dependency "ruby_parser", "~> 3.7"
+  spec.add_runtime_dependency "sexp2ruby", "~> 0.0.2"
+
+  # Required runtime dep: trollop > f7009b45,
+  # but gemspec does not support git :(
+  # spec.add_runtime_dependency "trollop", "~> 2.1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "cane", "~> 2.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest_to_rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: ruby2ruby
+  name: sexp2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +168,9 @@ files:
 - lib/minitest_to_rspec/errors.rb
 - lib/minitest_to_rspec/exp/base.rb
 - lib/minitest_to_rspec/exp/call.rb
+- lib/minitest_to_rspec/exp/calls/once.rb
 - lib/minitest_to_rspec/exp/calls/returns.rb
+- lib/minitest_to_rspec/exp/calls/twice.rb
 - lib/minitest_to_rspec/exp/hash_exp.rb
 - lib/minitest_to_rspec/exp/iter.rb
 - lib/minitest_to_rspec/exp/klass.rb