transpec 1.1.2 → 1.2.0

data/lib/transpec/syntax/method_stub.rb

@@ -29,7 +29,7 @@ module Transpec
         check_syntax_availability(__method__)
       end
 
-      def allowize!
+      def allowize!(receive_messages_available = false)
         # There's no way of unstubbing in #allow syntax.
         return unless [:stub, :stub!].include?(method_name)
 
@@ -37,15 +37,19 @@ module Transpec
           fail InvalidContextError.new(selector_range, "##{method_name}", '#allow')
         end
 
-        if arg_node.type == :hash
-          expressions = build_allow_expressions_from_hash_node(arg_node)
-          replace(expression_range, expressions)
-        else
-          expression = build_allow_expression(arg_node)
-          replace(expression_range, expression)
-        end
+        source, type = if arg_node.type == :hash
+                         if receive_messages_available
+                           [build_allow_to_receive_messages_expression, :allow_to_receive_messages]
+                         else
+                           [build_allow_expressions_from_hash_node(arg_node), :allow_to_receive]
+                         end
+                       else
+                         [build_allow_expression(arg_node), :allow_to_receive]
+                       end
 
-        register_record(:allow)
+        replace(expression_range, source)
+
+        register_record(type)
       end
 
       def convert_deprecated_method!
@@ -87,6 +91,14 @@ module Transpec
         expression
       end
 
+      def build_allow_to_receive_messages_expression
+        expression =  allow_source
+        expression << range_in_between_receiver_and_selector.source
+        expression << 'to receive_messages'
+        expression << parentheses_range.source
+        expression
+      end
+
       def allow_source
         if any_instance?
           class_source = class_node_of_any_instance.loc.expression.source
@@ -122,10 +134,15 @@ module Transpec
 
       def converted_syntax(conversion_type)
         case conversion_type
-        when :allow
+        when :allow_to_receive, :allow_to_receive_messages
           syntax = any_instance? ? 'allow_any_instance_of(SomeClass)' : 'allow(obj)'
-          syntax << '.to receive(:message)'
-          syntax << '.and_return(value)' if arg_node.type == :hash
+          syntax << '.to '
+          if conversion_type == :allow_to_receive
+            syntax << 'receive(:message)'
+            syntax << '.and_return(value)' if arg_node.type == :hash
+          else
+            syntax << 'receive_messages(:message => value)'
+          end
         when :deprecated
           syntax = 'obj.'
           syntax << replacement_method_for_deprecated_method

data/lib/transpec/version.rb

@@ -4,8 +4,8 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 1
-    PATCH = 2
+    MINOR = 2
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/lib/transpec.rb

@@ -1,7 +1,31 @@
 # coding: utf-8
 
+require 'transpec/rspec_version'
+
 module Transpec
   def self.root
     File.expand_path('..', File.dirname(__FILE__))
   end
+
+  def self.required_rspec_version
+    @required_rspec_version ||= begin
+      gemspec_path = File.join(root, 'transpec.gemspec')
+      gem_specification = Gem::Specification.load(gemspec_path)
+      rspec_dependency = gem_specification.dependencies.find { |d| d.name == 'rspec' }
+
+      if rspec_dependency
+        rspec_requirement = rspec_dependency.requirement
+        gem_version = rspec_requirement.requirements.first.find { |r| r.is_a?(Gem::Version) }
+        RSpecVersion.new(gem_version.to_s)
+      else
+        # Using development version of RSpec with Bundler.
+        current_rspec_version
+      end
+    end
+  end
+
+  def self.current_rspec_version
+    require 'rspec/version'
+    RSpecVersion.new(RSpec::Version::STRING)
+  end
 end

data/spec/support/cache_helper.rb

@@ -17,6 +17,17 @@ module CacheHelper
     end
   end
 
+  def with_cached_dir(dirname)
+    dir_path = File.join(cache_dir, dirname)
+
+    cached = Dir.exist?(dir_path)
+    FileUtils.mkdir_p(dir_path) unless cached
+
+    Dir.chdir(dir_path) do
+      yield cached
+    end
+  end
+
   def load_cache(path)
     File.open(path) do |file|
       Marshal.load(file)
@@ -36,8 +47,8 @@ module CacheHelper
 
   def cache_dir
     @cache_dir ||= begin
-      spec_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      cache_dir = File.join(spec_dir, 'cache')
+      project_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+      cache_dir = File.join(project_root, 'tmp', 'spec_cache')
 
       unless Dir.exist?(cache_dir)
         require 'fileutils'

data/spec/transpec/cli_spec.rb

@@ -9,6 +9,10 @@ module Transpec
 
     subject(:cli) { CLI.new }
 
+    before do
+      cli.project.stub(:rspec_version).and_return(Transpec.current_rspec_version)
+    end
+
     describe '.run' do
       it 'invokes #run' do
         args = ['foo', 'bar']
@@ -52,6 +56,13 @@ module Transpec
         end
       end
 
+      shared_examples 'aborts processing' do
+        it 'aborts processing' do
+          cli.should_not_receive(:convert_file)
+          cli.run(args).should be_false
+        end
+      end
+
       context 'when git is available' do
         before { Git.stub(:command_available?).and_return(true) }
 
@@ -61,11 +72,8 @@ module Transpec
           context 'and the repository is not clean' do
             before { Git.stub(:clean?).and_return(false) }
 
-            context '--force option is not specified' do
-              it 'aborts processing' do
-                cli.should_not_receive(:convert_file)
-                cli.run(args).should be_false
-              end
+            context 'and --force option is not specified' do
+              include_examples 'aborts processing'
 
               it 'warns to the user' do
                 cli.should_receive(:warn) do |arg|
@@ -76,8 +84,14 @@ module Transpec
               end
             end
 
-            context '#forced? is true' do
-              before { args << '--force' }
+            context 'and --force option is specified' do
+              before do
+                args << '--force'
+                # Silence "fatal: Not a git repository (or any of the parent directories): .git"
+                # from Bundler.
+                `git init`
+              end
+
               include_examples 'rewrites files'
             end
           end
@@ -99,6 +113,23 @@ module Transpec
         include_examples 'rewrites files'
       end
 
+      context "when the project's RSpec dependency is older than the required version" do
+        before do
+          Git.stub(:command_available?).and_return(false)
+          cli.project.stub(:rspec_version).and_return(RSpecVersion.new('2.13.0'))
+        end
+
+        include_examples 'aborts processing'
+
+        it 'warns to the user' do
+          cli.should_receive(:warn) do |arg|
+            arg.should match(/rspec.+dependency/i)
+          end
+
+          cli.run(args)
+        end
+      end
+
       context 'when a syntax error is raised while processing files' do
         let(:args) { [invalid_syntax_file_path, valid_syntax_file_path] }
         let(:invalid_syntax_file_path) { 'invalid_example.rb' }

data/spec/transpec/configuration_spec.rb

@@ -18,22 +18,19 @@ module Transpec
         [:parenthesize_matcher_arg?,  true],
         [:forced?,                    false],
         [:skip_dynamic_analysis?,     false],
-        [:generate_commit_message?,   false]
+        [:generate_commit_message?,   false],
+        [:negative_form_of_to,        'not_to'],
+        [:boolean_matcher_type,       :conditional],
+        [:form_of_be_falsey,          'be_falsey']
       ].each do |attribute, value|
         describe "##{attribute}" do
           subject { configuration.send(attribute) }
 
-          it "is #{value}" do
+          it "is #{value.inspect}" do
             should == value
           end
         end
       end
-
-      describe '#negative_form_of_to' do
-        it 'is "not_to"' do
-          configuration.negative_form_of_to.should == 'not_to'
-        end
-      end
     end
 
     describe '#negative_form_of_to=' do
@@ -54,5 +51,43 @@ module Transpec
         end
       end
     end
+
+    describe '#boolean_matcher_type=' do
+      [:conditional, :exact] .each do |type|
+        context "when #{type.inspect} is passed" do
+          it "sets #{type.inspect}" do
+            configuration.boolean_matcher_type = type
+            configuration.boolean_matcher_type.should == type
+          end
+        end
+      end
+
+      context 'when a type other than :conditional or :exact is passed' do
+        it 'raises error' do
+          lambda do
+            configuration.boolean_matcher_type = :foo
+          end.should raise_error(ArgumentError)
+        end
+      end
+    end
+
+    describe '#form_of_be_falsey=' do
+      ['be_falsey', 'be_falsy'] .each do |form|
+        context "when #{form.inspect} is passed" do
+          it "sets #{form.inspect}" do
+            configuration.form_of_be_falsey = form
+            configuration.form_of_be_falsey.should == form
+          end
+        end
+      end
+
+      context 'when a form other than "be_falsey" or "be_falsy" is passed' do
+        it 'raises error' do
+          lambda do
+            configuration.form_of_be_falsey = 'foo'
+          end.should raise_error(ArgumentError)
+        end
+      end
+    end
   end
 end

data/spec/transpec/converter_spec.rb

@@ -5,7 +5,8 @@ require 'transpec/converter'
 
 module Transpec
   describe Converter do
-    subject(:converter) { Converter.new(configuration) }
+    subject(:converter) { Converter.new(configuration, rspec_version) }
+    let(:rspec_version) { Transpec.current_rspec_version }
     let(:configuration) { Configuration.new }
 
     describe '#convert_file!' do
@@ -380,8 +381,8 @@ module Transpec
       let(:method_stub_object) { double('method_stub_object').as_null_object }
 
       shared_examples 'invokes MethodStub#allowize!' do
-        it 'invokes MethodStub#allowize!' do
-          method_stub_object.should_receive(:allowize!)
+        it 'invokes MethodStub#allowize! with #receive_messages availability' do
+          method_stub_object.should_receive(:allowize!).with(rspec_version.receive_messages_available?)
           converter.process_method_stub(method_stub_object)
         end
       end
@@ -484,6 +485,69 @@ module Transpec
       end
     end
 
+    describe '#process_be_boolean' do
+      let(:be_boolean_object) { double('be_boolean_object').as_null_object }
+
+      context 'when RSpecVersion#be_truthy_available? returns true' do
+        before { rspec_version.stub(:be_truthy_available?).and_return(true) }
+
+        context 'when Configuration#convert_deprecated_method? is true' do
+          before { configuration.convert_deprecated_method = true }
+
+          context 'and Configuration#boolean_matcher_type is :conditional' do
+            before { configuration.boolean_matcher_type = :conditional }
+
+            context 'and Configuration#form_of_be_falsey is "be_falsey"' do
+              before { configuration.form_of_be_falsey = 'be_falsey' }
+
+              it 'invokes BeBoolean#convert_to_conditional_matcher! with "be_falsey"' do
+                be_boolean_object.should_receive(:convert_to_conditional_matcher!).with('be_falsey')
+                converter.process_be_boolean(be_boolean_object)
+              end
+            end
+
+            context 'and Configuration#form_of_be_falsey is "be_falsy"' do
+              before { configuration.form_of_be_falsey = 'be_falsy' }
+
+              it 'invokes BeBoolean#convert_to_conditional_matcher! with "be_falsy"' do
+                be_boolean_object.should_receive(:convert_to_conditional_matcher!).with('be_falsy')
+                converter.process_be_boolean(be_boolean_object)
+              end
+            end
+          end
+
+          context 'and Configuration#boolean_matcher_type is :exact' do
+            before { configuration.boolean_matcher_type = :exact }
+
+            it 'invokes BeBoolean#convert_to_exact_matcher!' do
+              be_boolean_object.should_receive(:convert_to_exact_matcher!)
+              converter.process_be_boolean(be_boolean_object)
+            end
+          end
+        end
+
+        context 'when Configuration#convert_deprecated_method? is false' do
+          before { configuration.convert_deprecated_method = false }
+
+          it 'does nothing' do
+            be_boolean_object.should_not_receive(:convert_to_conditional_matcher!)
+            be_boolean_object.should_not_receive(:convert_to_exact_matcher!)
+            converter.process_be_boolean(be_boolean_object)
+          end
+        end
+      end
+
+      context 'when RSpecVersion#be_truthy_available? returns true' do
+        before { rspec_version.stub(:be_truthy_available?).and_return(false) }
+
+        it 'does nothing' do
+          be_boolean_object.should_not_receive(:convert_to_conditional_matcher!)
+          be_boolean_object.should_not_receive(:convert_to_exact_matcher!)
+          converter.process_be_boolean(be_boolean_object)
+        end
+      end
+    end
+
     describe '#process_be_close' do
       let(:be_close_object) { double('be_close_object').as_null_object }
 
@@ -496,7 +560,7 @@ module Transpec
         end
       end
 
-      context 'when Configuration#convert_deprecated_method? is true' do
+      context 'when Configuration#convert_deprecated_method? is false' do
         before { configuration.convert_deprecated_method = false }
 
         it 'does not invoke BeClose#convert_to_be_within!' do
@@ -518,7 +582,7 @@ module Transpec
         end
       end
 
-      context 'when Configuration#convert_deprecated_method? is true' do
+      context 'when Configuration#convert_deprecated_method? is false' do
         before { configuration.convert_deprecated_method = false }
 
         it 'does not invoke BeClose#convert_to_be_within!' do
@@ -540,7 +604,7 @@ module Transpec
         end
       end
 
-      context 'when Configuration#convert_its? is true' do
+      context 'when Configuration#convert_its? is false' do
         before { configuration.convert_its = false }
 
         it 'does not invoke Its#convert_to_describe_subject_it!' do

data/spec/transpec/option_parser_spec.rb

@@ -105,7 +105,7 @@ module Transpec
           context "when #{form.inspect} is specified" do
             let(:args) { ['--negative-form', form] }
 
-            it "sets Configuration#negative_form_of_to? #{form.inspect}" do
+            it "sets Configuration#negative_form_of_to #{form.inspect}" do
               parser.parse(args)
               configuration.negative_form_of_to.should == form
             end
@@ -113,6 +113,38 @@ module Transpec
         end
       end
 
+      describe '-b/--boolean-matcher option' do
+        [
+          ['truthy,falsey', :conditional, 'be_falsey'],
+          ['truthy,falsy',  :conditional, 'be_falsy'],
+          ['true,false',    :exact,       'be_falsey']
+        ].each do |cli_type, configuration_type, form_of_be_falsey|
+          context "when #{cli_type.inspect} is specified" do
+            let(:args) { ['--boolean-matcher', cli_type] }
+
+            it "sets Configuration#boolean_matcher_type #{configuration_type.inspect}" do
+              parser.parse(args)
+              configuration.boolean_matcher_type.should == configuration_type
+            end
+
+            it "sets Configuration#form_of_be_falsey #{form_of_be_falsey.inspect}" do
+              parser.parse(args)
+              configuration.form_of_be_falsey.should == form_of_be_falsey
+            end
+          end
+        end
+
+        ['', 'truthy', 'true', 'foo'].each do |cli_type|
+          context "when #{cli_type.inspect} is specified" do
+            let(:args) { ['--boolean-matcher', cli_type] }
+
+            it 'raises error' do
+              -> { parser.parse(args) }.should raise_error(/must be any of/)
+            end
+          end
+        end
+      end
+
       describe '-p/--no-parentheses-matcher-arg option' do
         let(:args) { ['--no-parentheses-matcher-arg'] }
 

data/spec/transpec/project_spec.rb

@@ -0,0 +1,73 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/project'
+
+module Transpec
+  describe Project do
+    include FileHelper
+    include CacheHelper
+
+    subject(:project) { Project.new }
+
+    describe '#require_bundler?' do
+      include_context 'isolated environment'
+
+      subject { project.require_bundler? }
+
+      context 'when the project has a Gemfile' do
+        before do
+          create_file('Gemfile', '')
+        end
+
+        it { should be_true }
+      end
+
+      context 'when the project have no Gemfile' do
+        it { should be_false }
+      end
+    end
+
+    describe '#rspec_version' do
+      subject(:rspec_version) { project.rspec_version }
+
+      it 'returns an instance of RSpecVersion' do
+        should be_a(RSpecVersion)
+      end
+
+      context 'when the project has a Gemfile' do
+        context 'and depends on RSpec 2.13.0' do
+          around do |example|
+            with_cached_dir('rspec-2.13.0-project') do |cached|
+              unless cached
+                create_file('Gemfile', [
+                  "source 'https://rubygems.org'",
+                  "gem 'rspec-core', '2.13.0'"
+                ])
+
+                project.with_bundler_clean_env do
+                  `bundle install --path vendor/bundle`
+                end
+              end
+
+              example.run
+            end
+          end
+
+          it 'returns the version' do
+            rspec_version.to_s.should == '2.13.0'
+          end
+        end
+      end
+
+      context 'when the project has no Gemfile' do
+        include_context 'isolated environment'
+
+        it 'returns version of the RSpec that is installed in the system' do
+          require 'rspec/core/version'
+          rspec_version.to_s.should == RSpec::Core::Version::STRING
+        end
+      end
+    end
+  end
+end

data/spec/transpec/rspec_version_spec.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/rspec_version'
+
+module Transpec
+  describe RSpecVersion do
+    subject(:rspec_version) { RSpecVersion.new(version_string) }
+
+    describe '#be_truthy_available?' do
+      subject { rspec_version.be_truthy_available? }
+
+      [
+        ['2.14.0',        false],
+        ['2.99.0.beta.1', true],
+        ['2.99.0',        true],
+        ['3.0.0.beta.1',  true],
+        ['3.0.0',         true]
+      ].each do |version, expected|
+        context "when the version is #{version}" do
+          let(:version_string) { version }
+          it { should == expected }
+        end
+      end
+    end
+
+    describe '#receive_messages_available?' do
+      subject { rspec_version.receive_messages_available? }
+
+      [
+        ['2.14.0',        false],
+        ['2.99.0.beta.1', false],
+        ['2.99.0',        false],
+        ['3.0.0.beta.1',  true],
+        ['3.0.0',         true]
+      ].each do |version, expected|
+        context "when the version is #{version}" do
+          let(:version_string) { version }
+          it { should == expected }
+        end
+      end
+    end
+  end
+end