minitest_to_rspec 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9011484ab4056d56fdcf1724f967ca355daf7034
-  data.tar.gz: 82d5487382d8d54eb0fe8a0ffaeb8f5ec7ac61fc
+  metadata.gz: be2fe63a020fb7a38b10551341162eb978a0b84c
+  data.tar.gz: '0696d05d0c95b8cb6afbe1865ae224b2e8066e86'
 SHA512:
-  metadata.gz: e69a27949af71f8a10779215e074caa1a4866b5b44225c6d309310423595491e67cece970dcb21ff04e433a6a87c95975ba2ff7de3c8233b983850ba8db36812
-  data.tar.gz: 72e5f6e912b445829d5f2d4934685b15e5ef0d8737e2f276aba5201175a5fe00c370e35f621f3b989cbb3134888862becddb9ad9059e5657d8f5beea09d795c2
+  metadata.gz: 1f44130fe3b150666829ff09abd348e92dffa6104f70678412ea1ef9e9e7cb363280549930796062d4c346590f634584cab18cd9db92f1c16f5a876b3ae88833
+  data.tar.gz: ef3a2361df027ddb59c33f858c49641f295298fa60d6a140bc63b60408e9706c2ec4d57cba346ed964d1eb7de5aa017b016b1bf151f403dfac5046f618b49c5b

data/.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   Exclude:
     - spec/fixtures/**/*
@@ -40,6 +38,9 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Enabled: false
 
+Metrics/ParameterLists:
+  Max: 6
+
 # EOS is a well-known delimiter and thus satisfactory.
 Naming/HeredocDelimiterNaming:
   Enabled: false
@@ -52,6 +53,14 @@ Style/Documentation:
   Exclude:
     - 'spec/**/*'
 
+# Too subtle to lint. Avoid postfix operators unless line is very simple.
+Style/IfUnlessModifier:
+  Enabled: false
+
 # Guard clauses are great, but this is too subtle to lint.
 Style/GuardClause:
   Enabled: false
+
+# Too subtle to lint. Avoid postfix operators unless line is very simple.
+Style/WhileUntilModifier:
+  Enabled: false

data/CHANGELOG.md

@@ -17,6 +17,23 @@ of [keepachangelog.com][2].
 
 - None
 
+## 0.11.0 (2017-11-10)
+
+### Breaking Changes
+
+- None
+
+### Added
+
+- [#15](https://github.com/jaredbeck/minitest_to_rspec/pull/15) -
+  Support mocha stubs without returns
+- [#16](https://github.com/jaredbeck/minitest_to_rspec/pull/16) -
+  Convert `should` to `it`
+
+### Fixed
+
+- None
+
 ## 0.10.2 (2017-11-09)
 
 ### Breaking Changes

data/README.md

@@ -8,6 +8,7 @@ Converts [minitest][8] files to [rspec][9].
   and [ActiveSupport][27] are converted to [rspec-expectations][25].
 - Selected methods from [mocha][28] are converted to [rspec-mocks][24].
   (Experimental)
+- Selected methods from [shoulda-context][36]
 
 ## Example
 
@@ -111,6 +112,14 @@ Mocha                 | Arity | Block | Notes
 
 To do: [at_least, never, raises, etc.][30]
 
+## Supported shoulda-context methods
+
+Mocha                 | Arity | Block | Notes
+--------------------- | ----- | ----- | -------
+[context][36]         | 1     | yes   |
+[setup][37]           | 1,2   | no    |
+[should][38]          | 1,2   | yes   |
+
 ## Acknowledgements
 
 This project would not be possible without [ruby_parser][14],
@@ -147,3 +156,7 @@ This project would not be possible without [ruby_parser][14],
 [32]: http://www.rubydoc.info/github/floehopper/mocha/Mocha/Expectation#twice-instance_method
 [34]: https://github.com/bbatsov/ruby-style-guide
 [35]: https://github.com/bbatsov/rubocop
+[35]: https://github.com/thoughtbot/shoulda-context
+[36]: http://www.rubydoc.info/github/thoughtbot/shoulda-context/master/Shoulda/Context/ClassMethods#context-instance_method
+[37]: http://www.rubydoc.info/github/thoughtbot/shoulda-context/master/Shoulda/Context/Context#setup-instance_method
+[38]: http://www.rubydoc.info/github/thoughtbot/shoulda-context/master/Shoulda/Context/ClassMethods#should-instance_method

data/Rakefile

@@ -13,4 +13,4 @@ end
 # Default task: lint then test
 task default: [] # in case it hasn't been set
 Rake::Task[:default].clear
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "minitest_to_rspec"
-require "byebug"
-require "irb"
+require 'bundler/setup'
+require 'minitest_to_rspec'
+require 'byebug'
+require 'irb'
 IRB.start

data/bin/mt2rspec

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "minitest_to_rspec/cli"
+require 'minitest_to_rspec/cli'
 MinitestToRspec::CLI.new(ARGV).run

data/doc/mocha/mocha_test.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rubygems'
+gem 'mocha'
+require 'minitest/unit'
+require 'mocha/mini_test'
+require 'minitest/autorun'
+
+# Reverse engineering mocha, to clarify some things missing in the mocha docs.
+class TestDerp < Minitest::Test
+  def test_expects_return_value
+    x = Object.new
+    x.define_singleton_method(:y) { :z } # this won't get called
+    x.expects(:y)
+    assert_nil x.y
+    # passes
+  end
+
+  def test_stubs_only
+    x = Object.new
+    x.stubs(:y)
+    # passes
+  end
+
+  def test_stubs_returns
+    x = Object.new
+    x.stubs(:y).returns(:z)
+    # passes
+  end
+
+  def test_stubs_once
+    x = Object.new
+    x.stubs(:y).once
+    # fails: expected exactly once, not yet invoked
+  end
+
+  def test_stubs_twice
+    x = Object.new
+    x.stubs(:y).twice
+    # fails: expected exactly twice, not yet invoked
+  end
+
+  def test_stubs_return_value
+    x = Object.new
+    x.define_singleton_method(:y) { :z } # this won't get called
+    x.stubs(:y)
+    assert_nil x.y
+    # passes
+  end
+end

data/lib/minitest_to_rspec/cli.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require "fileutils"
-require "minitest_to_rspec"
-require "trollop"
+require 'fileutils'
+require 'minitest_to_rspec'
+require 'trollop'
 
 module MinitestToRspec
   # Command-Line Interface (CLI) instantiated by `bin/mt2rspec`
   class CLI
-    E_USAGE               = 1.freeze
-    E_FILE_NOT_FOUND      = 2.freeze
-    E_FILE_ALREADY_EXISTS = 3.freeze
-    E_CONVERT_FAIL        = 4.freeze
-    E_CANNOT_CREATE_TARGET_DIR = 5.freeze
+    E_USAGE               = 1
+    E_FILE_NOT_FOUND      = 2
+    E_FILE_ALREADY_EXISTS = 3
+    E_CONVERT_FAIL        = 4
+    E_CANNOT_CREATE_TARGET_DIR = 5
 
-    BANNER = <<~EOS.freeze
+    BANNER = <<~EOS
       Usage: mt2rspec [--rails] [--mocha] source_file [target_file]
 
       Reads source_file, writes target_file. If target_file is omitted,
@@ -23,8 +23,8 @@ module MinitestToRspec
 
       Options:
     EOS
-    OPT_MOCHA = "Convert mocha to rspec-mocks. (Experimental)"
-    OPT_RAILS = <<~EOS.tr("\n", " ").freeze
+    OPT_MOCHA = 'Convert mocha to rspec-mocks. (Experimental)'
+    OPT_RAILS = <<~EOS.tr("\n", ' ').freeze
       Requires rails_helper instead of spec_helper.
       Passes :type metadatum to RSpec.describe.
     EOS
@@ -48,7 +48,7 @@ module MinitestToRspec
         @source = args[0]
         @target = infer_target_from @source
       else
-        warn "Please specify source file"
+        warn 'Please specify source file'
         exit E_USAGE
       end
     end
@@ -59,7 +59,7 @@ module MinitestToRspec
       ensure_target_directory(target)
       write_target(converter.convert(read_source, source))
     rescue Error => e
-      $stderr.puts "Failed to convert: #{e}"
+      warn "Failed to convert: #{e}"
       exit E_CONVERT_FAIL
     end
 
@@ -67,14 +67,14 @@ module MinitestToRspec
 
     def assert_file_exists(file)
       unless File.exist?(file)
-        $stderr.puts "File not found: #{file}"
+        warn "File not found: #{file}"
         exit(E_FILE_NOT_FOUND)
       end
     end
 
     def assert_file_does_not_exist(file)
       if File.exist?(file)
-        $stderr.puts "File already exists: #{file}"
+        warn "File already exists: #{file}"
         exit(E_FILE_ALREADY_EXISTS)
       end
     end
@@ -89,16 +89,16 @@ module MinitestToRspec
       begin
         FileUtils.mkdir_p(dir)
       rescue SystemCallError => e
-        $stderr.puts "Cannot create target dir: #{dir}"
-        $stderr.puts e.message
+        warn "Cannot create target dir: #{dir}"
+        warn e.message
         exit E_CANNOT_CREATE_TARGET_DIR
       end
     end
 
     def infer_target_from(source)
       source
-        .gsub(/\Atest/, "spec")
-        .gsub(/_test.rb\Z/, "_spec.rb")
+        .gsub(/\Atest/, 'spec')
+        .gsub(/_test.rb\Z/, '_spec.rb')
     end
 
     def read_source

data/lib/minitest_to_rspec/converter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "ruby_parser"
-require "ruby2ruby"
-require_relative "processor"
-require_relative "errors"
+require 'ruby_parser'
+require 'ruby2ruby'
+require_relative 'processor'
+require_relative 'errors'
 
 module MinitestToRspec
   # Converts strings of minitest code. Does not read or write files.

data/lib/minitest_to_rspec/expression_builders/stub.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'minitest_to_rspec/type'
+
+module MinitestToRspec
+  module ExpressionBuilders
+    # Represents an `expects` or a `stubs`
+    class Stub
+      def initialize(receiver, any_instance, message, with, returns, count)
+        Type.assert(Sexp, receiver)
+        Type.bool(any_instance)
+        Type.assert(Sexp, message)
+        Type.assert([NilClass, Sexp], with)
+        Type.assert([NilClass, Sexp], returns)
+        Type.assert([NilClass, Integer], count)
+        @receiver = receiver
+        @any_instance = any_instance
+        @message = message
+        @with = with
+        @returns = returns
+        @count = count
+      end
+
+      # Returns a Sexp representing an RSpec stub (allow) or message
+      # expectation (expect)
+      def to_rspec_exp
+        stub_chain = s(:call, nil, :receive, @message)
+        unless @with.nil?
+          stub_chain = s(:call, stub_chain, :with, @with)
+        end
+        unless @returns.nil?
+          stub_chain = s(:call, stub_chain, :and_return, @returns)
+        end
+        unless @count.nil?
+          stub_chain = s(:call, stub_chain, receive_count_method)
+        end
+        expect_allow = s(:call, nil, rspec_mocks_method, @receiver.dup)
+        s(:call, expect_allow, :to, stub_chain)
+      end
+
+      private
+
+      def receive_count_method
+        case @count
+        when 1
+          :once
+        when 2
+          :twice
+        else
+          raise "Unsupported message receive count: #{@count}"
+        end
+      end
+
+      # Returns :expect or :allow
+      def rspec_mocks_method
+        prefix = @count.nil? ? 'allow' : 'expect'
+        suffix = @any_instance ? '_any_instance_of' : ''
+        (prefix + suffix).to_sym
+      end
+    end
+  end
+end

data/lib/minitest_to_rspec/model/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../sexp_assertions"
+require_relative '../sexp_assertions'
 
 module MinitestToRspec
   module Model

data/lib/minitest_to_rspec/model/call.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base"
+require_relative 'base'
 
 module MinitestToRspec
   module Model
@@ -50,7 +50,7 @@ module MinitestToRspec
 
       def assert_difference?
         return false unless method_name == :assert_difference
-        [[:str], [:str, :lit]].include?(argument_types)
+        [[:str], %i[str lit]].include?(argument_types)
       end
 
       def assert_no_difference?
@@ -72,10 +72,15 @@ module MinitestToRspec
       end
 
       def calls_in_receiver_chain
-        receiver_chain
-          .compact
-          .select { |r| sexp_type?(:call, r) }
-          .map { |r| Call.new(r) }
+        receiver_chain.each_with_object([]) do |e, a|
+          next unless sexp_type?(:call, e)
+          a << self.class.new(e)
+        end
+      end
+
+      def find_call_in_receiver_chain(method_names)
+        name_array = [method_names].flatten
+        calls_in_receiver_chain.find { |i| name_array.include?(i.method_name) }
       end
 
       def method_name
@@ -95,30 +100,13 @@ module MinitestToRspec
       # assertion failure message, which will be discarded later.
       def raise_error_args?
         arg_types = arguments.map(&:sexp_type)
-        [[], [:str], [:const], [:const, :str]].include?(arg_types)
+        [[], [:str], [:const], %i[const str]].include?(arg_types)
       end
 
       def receiver
         @exp[1]
       end
 
-      # While `#receiver` returns a `Sexp`, `#receiver_call`
-      # returns a `Model::Call`.
-      def receiver_call
-        if sexp_type?(:call, receiver)
-          rvc = Model::Call.new(receiver)
-
-          # TODO: Seems like a factory pattern
-          if rvc.method_name == :returns
-            Model::Calls::Returns.new(receiver)
-          else
-            rvc
-          end
-        else
-          raise TypeError
-        end
-      end
-
       # Consider the following chain of method calls:
       #
       #     @a.b.c
@@ -152,17 +140,19 @@ module MinitestToRspec
       end
 
       def receiver_chain_include?(method_name)
-        receiver_chain.compact.any? { |r| Call.method_name?(r, method_name) }
+        receiver_chain.compact.any? { |r|
+          self.class.method_name?(r, method_name)
+        }
       end
 
       def require_test_helper?
         method_name == :require &&
           one_string_argument? &&
-          arguments[0][1] == "test_helper"
+          arguments[0][1] == 'test_helper'
       end
 
       def question_mark_method?
-        method_name.to_s.end_with?("?")
+        method_name.to_s.end_with?('?')
       end
 
       private

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../call"
-require_relative "../../errors"
+require_relative '../call'
+require_relative '../../errors'
 
 module MinitestToRspec
   module Model

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../call"
-require_relative "../../errors"
+require_relative '../call'
+require_relative '../../errors'
 
 module MinitestToRspec
   module Model

data/lib/minitest_to_rspec/model/defn.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base"
+require_relative 'base'
 
 module MinitestToRspec
   module Model

data/lib/minitest_to_rspec/model/iter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base"
+require_relative 'base'
 
 module MinitestToRspec
   module Model

data/lib/minitest_to_rspec/model/klass.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "base"
+require_relative 'base'
 
 module MinitestToRspec
   module Model
@@ -13,15 +13,15 @@ module MinitestToRspec
       end
 
       def action_controller_test_case?
-        lineage?(parent, [:ActionController, :TestCase])
+        lineage?(parent, %i[ActionController TestCase])
       end
 
       def action_mailer_test_case?
-        lineage?(parent, [:ActionMailer, :TestCase])
+        lineage?(parent, %i[ActionMailer TestCase])
       end
 
       def active_support_test_case?
-        lineage?(parent, [:ActiveSupport, :TestCase])
+        lineage?(parent, %i[ActiveSupport TestCase])
       end
 
       # Raise an error if we don't know now to process the name
@@ -45,7 +45,7 @@ module MinitestToRspec
       end
 
       def draper_test_case?
-        lineage?(parent, [:Draper, :TestCase])
+        lineage?(parent, %i[Draper TestCase])
       end
 
       # Returns the name of the class.  Examples:

data/lib/minitest_to_rspec/processor.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "ruby_parser"
-require "sexp_processor"
-require_relative "subprocessors/call"
-require_relative "subprocessors/defn"
-require_relative "subprocessors/klass"
-require_relative "subprocessors/iter"
+require 'ruby_parser'
+require 'sexp_processor'
+require_relative 'subprocessors/call'
+require_relative 'subprocessors/defn'
+require_relative 'subprocessors/klass'
+require_relative 'subprocessors/iter'
 
 module MinitestToRspec
   # Consumes a `String` of minitest code and returns an S-expression

data/lib/minitest_to_rspec/subprocessors/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../sexp_assertions"
+require_relative '../sexp_assertions'
 
 module MinitestToRspec
   module Subprocessors

data/lib/minitest_to_rspec/subprocessors/call.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "../model/call"
-require_relative "../model/calls/returns"
-require_relative "../model/hash_exp"
-require_relative "base"
+require 'minitest_to_rspec/type'
+require 'minitest_to_rspec/expression_builders/stub'
+require_relative '../model/call'
+require_relative '../model/hash_exp'
+require_relative 'base'
 
 module MinitestToRspec
   module Subprocessors
@@ -166,9 +167,21 @@ module MinitestToRspec
         expect_to_not(eq(unexpected), calculated, true)
       end
 
+      # Processes an entire line of code that ends in `.returns`
       def method_returns
-        mocha_returns(Model::Calls::Returns.new(@exp.original))
-      rescue UnknownVariant
+        receiver = mocha_stub_receiver(@exp)
+        any_instance = rspec_any_instance?(@exp)
+        message_call = mocha_stub_expects(@exp)
+        message = message_call.arguments.first
+        with = mocha_stub_with(@exp)
+        returns = @exp.arguments.first
+        count = message_call.method_name == :expects ? 1 : nil
+        ExpressionBuilders::Stub.new(
+          receiver, any_instance, message, with, returns, count
+        ).to_rspec_exp
+      rescue StandardError
+        # TODO: We used to have an `UnknownVariant` error.
+        # That was nice and specific.
         @exp.original
       end
 
@@ -180,6 +193,10 @@ module MinitestToRspec
         end
       end
 
+      def method_should
+        s(:call, nil, :it, *@exp.arguments)
+      end
+
       # Happily, the no-block signatures of [stub][3] are the
       # same as [double][2].
       #
@@ -200,7 +217,7 @@ module MinitestToRspec
       def method_stub_everything
         if @exp.receiver.nil?
           d = s(:call, nil, :double, *@exp.arguments)
-          s(:call, d, :as_null_object,)
+          s(:call, d, :as_null_object)
         else
           @exp.original
         end
@@ -236,35 +253,50 @@ module MinitestToRspec
         expect_to(receive_and_call_original(lit_sexp), exp.receiver, true)
       end
 
-      def mocha_expectation_count(exp, ordinal)
-        raise ArgumentError unless exp.is_a?(Model::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
+      # TODO: add support for
+      # - at_least
+      # - at_least_once
+      # - at_most
+      # - at_most_once
+      # - never
+      def mocha_expectation_count(exp, count)
+        Type.assert(Model::Call, exp)
+        Type.assert(Integer, count)
+        receiver = mocha_stub_receiver(exp)
+        any_instance = rspec_any_instance?(exp)
+        message = mocha_stub_expects(exp).arguments.first
+        with = mocha_stub_with(exp)
+        returns = exp.find_call_in_receiver_chain(:returns)&.arguments&.first
+        ExpressionBuilders::Stub.new(
+          receiver, any_instance, message, with, returns, count
+        ).to_rspec_exp
+      end
+
+      # Given a mocha stub, e.g. `X.any_instance.expects(:y)`, returns `X`.
+      def mocha_stub_receiver(exp)
+        chain = exp.receiver_chain
+        last = chain[-1]
+        last.nil? ? chain[-2] : last
+      end
+
+      # Given an `exp` representing a chain of calls, like
+      # `stubs(x).returns(y).once`, finds the call to `stubs` or `expects`.
+      def mocha_stub_expects(exp)
+        exp.find_call_in_receiver_chain(%i[stubs expects])
+      end
+
+      def mocha_stub_with(exp)
+        exp.find_call_in_receiver_chain(:with)&.arguments&.first
+      end
+
+      def rspec_any_instance?(exp)
+        exp.calls_in_receiver_chain.any? { |i|
+          i.method_name.to_s.include?('any_instance')
+        }
       end
 
       def mocha_once(exp)
-        mocha_expectation_count(exp, :once)
-      end
-
-      # Given `r`, a `Model::Calls::Returns`, return a `Sexp` representing
-      # the equivalent stub or message expectation in RSpec.
-      def mocha_returns(r)
-        raise ArgumentError unless r.is_a?(Model::Calls::Returns)
-        subprocessor_method = "#{r.rspec_mocks_method}_receive_and_return"
-        send(subprocessor_method,
-          r.rspec_msg_recipient,
-          r.message,
-          r.values,
-          r.any_instance?,
-          r.with
-        )
+        mocha_expectation_count(exp, 1)
       end
 
       def mocha_stub(exp)
@@ -277,7 +309,7 @@ module MinitestToRspec
       end
 
       def mocha_twice(exp)
-        mocha_expectation_count(exp, :twice)
+        mocha_expectation_count(exp, 2)
       end
 
       def name_of_processing_method
@@ -307,7 +339,7 @@ module MinitestToRspec
             s(:call, nil, :lambda),
             0,
             s(:block,
-              s(:str, "Sorry for the pointless lambda here."),
+              s(:str, 'Sorry for the pointless lambda here.'),
               *array_of_calls
             )
           ),
@@ -341,7 +373,7 @@ module MinitestToRspec
       end
 
       def require_spec_helper
-        prefix = @rails ? "rails" : "spec"
+        prefix = @rails ? 'rails' : 'spec'
         s(:call, nil, :require, s(:str, "#{prefix}_helper"))
       end
 

data/lib/minitest_to_rspec/subprocessors/defn.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "../model/defn"
-require_relative "base"
+require_relative '../model/defn'
+require_relative 'base'
 
 module MinitestToRspec
   module Subprocessors

data/lib/minitest_to_rspec/subprocessors/iter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "base"
-require_relative "../model/iter"
+require_relative 'base'
+require_relative '../model/iter'
 
 module MinitestToRspec
   module Subprocessors

data/lib/minitest_to_rspec/subprocessors/klass.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "../errors"
-require_relative "../model/klass"
-require_relative "base"
+require_relative '../errors'
+require_relative '../model/klass'
+require_relative 'base'
 
 module MinitestToRspec
   module Subprocessors
@@ -39,7 +39,7 @@ module MinitestToRspec
       # Given a `test_class_name` like `BananaTest`, returns the
       # described class, like `Banana`.
       def described_class(test_class_name)
-        test_class_name.to_s.gsub(/Test\Z/, "").to_sym
+        test_class_name.to_s.gsub(/Test\Z/, '').to_sym
       end
 
       # Returns the head of the output Sexp.  If it's a test case,

data/lib/minitest_to_rspec/type.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module MinitestToRspec
+  # Runtime type assertion function.
+  module Type
+    class << self
+      def assert(types, value)
+        unless array_wrap(types).any? { |t| value.is_a?(t) }
+          raise TypeError, "Expected #{types}, got #{value}"
+        end
+      end
+
+      def bool(value)
+        unless [false, true].include?(value)
+          raise TypeError, "Expected Boolean, got #{value}"
+        end
+      end
+
+      private
+
+      # Implementation copied from Array.wrap in ActiveSupport 5
+      def array_wrap(object)
+        if object.nil?
+          []
+        elsif object.respond_to?(:to_ary)
+          object.to_ary || [object]
+        else
+          [object]
+        end
+      end
+    end
+  end
+end

data/lib/minitest_to_rspec/version.rb

@@ -2,7 +2,7 @@
 
 #:nodoc:
 module MinitestToRspec
-  VERSION = "0.10.2"
+  VERSION = '0.11.0'
 
   def self.gem_version
     ::Gem::Version.new(VERSION)

data/lib/minitest_to_rspec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "minitest_to_rspec/version"
-require "minitest_to_rspec/converter"
+require 'minitest_to_rspec/version'
+require 'minitest_to_rspec/converter'
 
 # A command-line tool for converting minitest files to rspec.
 module MinitestToRspec

data/minitest_to_rspec.gemspec

@@ -5,32 +5,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'minitest_to_rspec/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "minitest_to_rspec"
+  spec.name = 'minitest_to_rspec'
   spec.version = MinitestToRspec::VERSION
   spec.executables << 'mt2rspec'
-  spec.authors = ["Jared Beck"]
-  spec.email = ["jared@jaredbeck.com"]
+  spec.authors = ['Jared Beck']
+  spec.email = ['jared@jaredbeck.com']
 
-  spec.summary = "Converts minitest files to rspec"
+  spec.summary = 'Converts minitest files to rspec'
   spec.description = <<~EOS
     A command-line tool for converting minitest files to rspec.
   EOS
-  spec.homepage = "https://github.com/jaredbeck/minitest_to_rspec"
-  spec.license = "MIT"
+  spec.homepage = 'https://github.com/jaredbeck/minitest_to_rspec'
+  spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f|
     f.match(%r{^(test|spec|features)/})
   }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency "ruby2ruby", "~> 2.3"
-  spec.add_runtime_dependency "ruby_parser", "~> 3.8"
-  spec.add_runtime_dependency "trollop", "~> 2.1"
+  spec.add_runtime_dependency 'ruby2ruby', '~> 2.3'
+  spec.add_runtime_dependency 'ruby_parser', '~> 3.8'
+  spec.add_runtime_dependency 'trollop', '~> 2.1'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "byebug", "~> 9.1"
-  spec.add_development_dependency "rake", "~> 12.1"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop", "~> 0.51.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'byebug', '~> 9.1'
+  spec.add_development_dependency 'rake', '~> 12.1'
+  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'rubocop', '~> 0.51.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest_to_rspec
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
@@ -134,7 +134,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -145,16 +144,17 @@ files:
 - bin/console
 - bin/mt2rspec
 - doc/minitest.md
+- doc/mocha/mocha_test.rb
 - doc/rspec.md
 - doc/supported_assertions.md
 - lib/minitest_to_rspec.rb
 - lib/minitest_to_rspec/cli.rb
 - lib/minitest_to_rspec/converter.rb
 - lib/minitest_to_rspec/errors.rb
+- lib/minitest_to_rspec/expression_builders/stub.rb
 - lib/minitest_to_rspec/model/base.rb
 - lib/minitest_to_rspec/model/call.rb
 - lib/minitest_to_rspec/model/calls/once.rb
-- lib/minitest_to_rspec/model/calls/returns.rb
 - lib/minitest_to_rspec/model/calls/twice.rb
 - lib/minitest_to_rspec/model/defn.rb
 - lib/minitest_to_rspec/model/hash_exp.rb
@@ -167,6 +167,7 @@ files:
 - lib/minitest_to_rspec/subprocessors/defn.rb
 - lib/minitest_to_rspec/subprocessors/iter.rb
 - lib/minitest_to_rspec/subprocessors/klass.rb
+- lib/minitest_to_rspec/type.rb
 - lib/minitest_to_rspec/version.rb
 - minitest_to_rspec.gemspec
 homepage: https://github.com/jaredbeck/minitest_to_rspec

data/.rubocop_todo.yml

@@ -1,57 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-11-01 23:47:55 -0400 using RuboCop version 0.51.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/RedundantFreeze:
-  Exclude:
-    - 'lib/minitest_to_rspec/cli.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'spec/lib/cli_spec.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/StderrPuts:
-  Exclude:
-    - 'lib/minitest_to_rspec/cli.rb'
-
-# Offense count: 340
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Enabled: false
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: percent
-  MinSize: 3
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'lib/minitest_to_rspec/subprocessors/call.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/WhileUntilModifier:
-  Exclude:
-    - 'lib/minitest_to_rspec/subprocessors/iter.rb'

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

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../call"
-require_relative "../../errors"
-
-module MinitestToRspec
-  module Model
-    module Calls
-      # Represents a call to `returns`, the stubbing method
-      # from `mocha`.
-      class Returns < Call
-        KNOWN_RECEIVERS = %i[stubs expects with].freeze
-
-        def initialize(exp)
-          @exp = exp
-          raise UnknownVariant unless known_variant?
-        end
-
-        def stub?
-          receiver_chain_include?(:stubs)
-        end
-
-        def any_instance?
-          receiver_chain_include?(:any_instance)
-        end
-
-        def expectation?
-          receiver_chain_include?(:expects)
-        end
-
-        def known_variant?
-          r = receiver
-          !r.nil? &&
-            r.sexp_type == :call &&
-            KNOWN_RECEIVERS.include?(Call.new(r).method_name) &&
-            !values.empty? &&
-            message.sexp_type == :lit
-        end
-
-        def message
-          calls_in_receiver_chain
-            .find { |c| [:stubs, :expects].include? c.method_name }
-            .arguments[0]
-        end
-
-        # To avoid a `ProcessingError` please check `known_variant?`
-        # before calling `rspec_mocks_method`.
-        def rspec_mocks_method
-          s = stub?
-          e = expectation?
-          if s && e
-            raise ProcessingError, "Method chain contains stubs and expects"
-          elsif s
-            :allow
-          elsif e
-            :expect
-          else
-            raise ProcessingError, "Found returns without stubs or expects"
-          end
-        end
-
-        # Returns `Sexp` representing the object that will receive
-        # the stubbed message.  Examples:
-        #
-        #     banana.stubs(:delicious?).returns(true)
-        #     Kiwi.any_instance.stubs(:delicious?).returns(false)
-        #
-        # On the first line, the `rspec_msg_recipient` is `banana`. On the
-        # second, `Kiwi`.
-        #
-        def rspec_msg_recipient
-          receiver_chain.compact.last
-        end
-
-        # The return values
-        def values
-          arguments
-        end
-
-        def with
-          w = calls_in_receiver_chain.find { |c| c.method_name == :with }
-          w.nil? ? [] : w.arguments
-        end
-      end
-    end
-  end
-end