transpec 1.7.0 → 1.8.0

data/lib/transpec/syntax/should_receive.rb

@@ -157,12 +157,16 @@ module Transpec
         @report.records << record_class.new(self, negative_form_of_to)
       end
 
-      class ExpectRecord < Record
+      class ExpectBaseRecord < Record
         def initialize(should_receive, negative_form_of_to)
           @should_receive = should_receive
           @negative_form_of_to = negative_form_of_to
         end
 
+        def syntax_name
+          fail NotImplementedError
+        end
+
         def original_syntax
           syntax = if @should_receive.any_instance?
                      'Klass.any_instance.'
@@ -174,42 +178,32 @@ module Transpec
 
         def converted_syntax
           syntax = if @should_receive.any_instance?
-                     'expect_any_instance_of(Klass).'
+                     "#{syntax_name}_any_instance_of(Klass)."
                    else
-                     'expect(obj).'
+                     "#{syntax_name}(obj)."
                    end
           syntax << (@should_receive.positive? ? 'to' : @negative_form_of_to)
           syntax << ' receive(:message)'
         end
       end
 
-      class AllowRecord < Record
-        def initialize(should_receive, negative_form_of_to)
-          @should_receive = should_receive
-          @negative_form_of_to = negative_form_of_to
+      class ExpectRecord < ExpectBaseRecord
+        def syntax_name
+          'expect'
+        end
+      end
+
+      class AllowRecord < ExpectBaseRecord
+        def syntax_name
+          'allow'
         end
 
         def original_syntax
-          syntax = if @should_receive.any_instance?
-                     'Klass.any_instance.'
-                   else
-                     'obj.'
-                   end
-          syntax << "#{@should_receive.method_name}(:message)"
+          syntax = super
           syntax << '.any_number_of_times' if @should_receive.any_number_of_times?
           syntax << '.at_least(0)' if @should_receive.at_least_zero?
           syntax
         end
-
-        def converted_syntax
-          syntax = if @should_receive.any_instance?
-                     'allow_any_instance_of(Klass).'
-                   else
-                     'allow(obj).'
-                   end
-          syntax << (@should_receive.positive? ? 'to' : @negative_form_of_to)
-          syntax << ' receive(:message)'
-        end
       end
 
       class StubRecord < Record
@@ -228,20 +222,6 @@ module Transpec
           'obj.stub(:message)'
         end
       end
-
-      class AnyInstanceBlockRecord < Record
-        def initialize(should_receive, *)
-          @should_receive = should_receive
-        end
-
-        def original_syntax
-          "Klass.any_instance.#{@should_receive.method_name}(:message) { |arg| }"
-        end
-
-        def converted_syntax
-          "Klass.any_instance.#{@should_receive.method_name}(:message) { |instance, arg| }"
-        end
-      end
     end
   end
 end

data/lib/transpec/util.rb

@@ -60,6 +60,12 @@ module Transpec
       source[0] == '(' && source[-1] == ')'
     end
 
+    def first_block_arg_name(block_node)
+      args_node = block_node.children[1]
+      first_arg_node = args_node.children.first
+      first_arg_node.children.first
+    end
+
     def block_node_taken_by_method(node)
       parent_node = node.parent_node
       return nil unless parent_node

data/lib/transpec/version.rb

@@ -4,7 +4,7 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
 
     def self.to_s

data/spec/transpec/configuration_spec.rb

@@ -18,6 +18,7 @@ module Transpec
         [:convert_deprecated_method?,                             true],
         [:parenthesize_matcher_arg?,                              true],
         [:add_receiver_arg_to_any_instance_implementation_block?, true],
+        [:convert_stub_with_hash_to_stub_and_return?,             false],
         [:forced?,                                                false],
         [:skip_dynamic_analysis?,                                 false],
         [:negative_form_of_to,                                    'not_to'],

data/spec/transpec/converter_spec.rb

@@ -78,6 +78,10 @@ module Transpec
           END
         end
 
+        before do
+          configuration.convert_stub_with_hash_to_stub_and_return = true
+        end
+
         it 'converts all targets properly' do
           should == expected_source
         end
@@ -626,13 +630,59 @@ module Transpec
         context 'and Configuration#convert_deprecated_method? is true' do
           before { configuration.convert_deprecated_method = true }
 
-          include_examples 'invokes MethodStub#allowize!'
-          include_examples 'does not invoke MethodStub#convert_deprecated_method!'
-          include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+          context 'and MethodStub#hash_arg? is false' do
+            before { method_stub_object.stub(:hash_arg?).and_return(false) }
+            include_examples 'invokes MethodStub#allowize!'
+            include_examples 'does not invoke MethodStub#convert_deprecated_method!'
+            include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+          end
+
+          context 'and MethodStub#hash_arg? is true' do
+            before { method_stub_object.stub(:hash_arg?).and_return(true) }
+
+            context 'and Configuration#convert_stub_with_hash_to_stub_and_return? is true' do
+              before { configuration.convert_stub_with_hash_to_stub_and_return = true }
+
+              context 'and RSpecVersion#receive_messages_available? is true' do
+                before { rspec_version.stub(:receive_messages_available?).and_return(true) }
+                include_examples 'invokes MethodStub#allowize!'
+                include_examples 'does not invoke MethodStub#convert_deprecated_method!'
+                include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+              end
+
+              context 'and RSpecVersion#receive_messages_available? is false' do
+                before { rspec_version.stub(:receive_messages_available?).and_return(false) }
+                include_examples 'invokes MethodStub#allowize!'
+                include_examples 'does not invoke MethodStub#convert_deprecated_method!'
+                include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+              end
+            end
+
+            context 'and Configuration#convert_stub_with_hash_to_stub_and_return? is false' do
+              before { configuration.convert_stub_with_hash_to_stub_and_return = false }
+
+              context 'and RSpecVersion#receive_messages_available? is true' do
+                before { rspec_version.stub(:receive_messages_available?).and_return(true) }
+                include_examples 'invokes MethodStub#allowize!'
+                include_examples 'does not invoke MethodStub#convert_deprecated_method!'
+                include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+              end
+
+              context 'and RSpecVersion#receive_messages_available? is false' do
+                before { rspec_version.stub(:receive_messages_available?).and_return(false) }
+                include_examples 'does not invoke MethodStub#allowize!'
+                include_examples 'invokes MethodStub#convert_deprecated_method!'
+                include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
+              end
+            end
+          end
         end
 
         context 'and Configuration#convert_deprecated_method? is false' do
-          before { configuration.convert_deprecated_method = false }
+          before do
+            configuration.convert_deprecated_method = false
+            method_stub_object.stub(:hash_arg?).and_return(false)
+          end
 
           include_examples 'invokes MethodStub#allowize!'
           include_examples 'does not invoke MethodStub#convert_deprecated_method!'
@@ -896,7 +946,13 @@ module Transpec
     end
 
     describe '#process_rspec_configure' do
-      let(:rspec_configure) { double('rspec_configure').as_null_object }
+      let(:rspec_configure) do
+        double(
+          'rspec_configure',
+          expectations: double('expectations').as_null_object,
+                 mocks: double('mocks').as_null_object
+        ).as_null_object
+      end
 
       context 'when #need_to_modify_expectation_syntax_configuration? returns true' do
         before do

data/spec/transpec/option_parser_spec.rb

@@ -155,6 +155,15 @@ module Transpec
         end
       end
 
+      describe '-t/--convert-stub-with-hash option' do
+        let(:args) { ['--convert-stub-with-hash'] }
+
+        it 'sets Configuration#convert_stub_with_hash_to_stub_and_return? true' do
+          parser.parse(args)
+          configuration.convert_stub_with_hash_to_stub_and_return?.should be_true
+        end
+      end
+
       describe '-p/--no-parentheses-matcher-arg option' do
         let(:args) { ['--no-parentheses-matcher-arg'] }
 

data/spec/transpec/syntax/have_spec.rb

@@ -943,7 +943,7 @@ module Transpec
                 rewritten_source.should == expected_source
               end
 
-              it 'adds record ' +
+              it 'adds record ' \
                  '`expect(obj).to have(n).errors_on(...)` -> `expect(obj.errors_on(...).size).to eq(n)`' do
                 have_object.convert_to_standard_expectation!
                 record.original_syntax.should  == 'expect(obj).to have(n).errors_on(...)'
@@ -993,7 +993,7 @@ module Transpec
                 rewritten_source.should == expected_source
               end
 
-              it 'adds record ' +
+              it 'adds record ' \
                  '`expect(obj).to have(n).errors_on(...)` -> `expect(obj.send(:errors_on, ...).size).to eq(n)`' do
                 have_object.convert_to_standard_expectation!
                 record.original_syntax.should  == 'expect(obj).to have(n).errors_on(...)'
@@ -1040,7 +1040,7 @@ module Transpec
               rewritten_source.should == expected_source
             end
 
-            it 'adds record ' +
+            it 'adds record ' \
                '`expect(obj).to have(n).errors_on(...)` -> `expect(obj.errors_on(...).size).to eq(n)`' do
               have_object.convert_to_standard_expectation!
               record.original_syntax.should  == 'expect(obj).to have(n).errors_on(...)'

data/spec/transpec/syntax/method_stub_spec.rb

@@ -151,6 +151,38 @@ module Transpec
         end
       end
 
+      describe '#hash_arg?' do
+        subject { method_stub_object.hash_arg? }
+
+        context 'when it is `subject.stub(:method => value)` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  subject.stub(:foo => value)
+                end
+              end
+            END
+          end
+
+          it { should be_true }
+        end
+
+        context 'when it is `subject.stub(:method)` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  subject.stub(:foo)
+                end
+              end
+            END
+          end
+
+          it { should be_false }
+        end
+      end
+
       describe '#allowize!' do
         before do
           method_stub_object.allowize!(rspec_version) unless example.metadata[:no_before_allowize!]
@@ -409,7 +441,7 @@ module Transpec
               rewritten_source.should == expected_source
             end
 
-            it 'adds record ' +
+            it 'adds record ' \
                '`obj.stub(:message => value)` -> `allow(obj).to receive_messages(:message => value)`' do
               record.original_syntax.should  == 'obj.stub(:message => value)'
               record.converted_syntax.should == 'allow(obj).to receive_messages(:message => value)'
@@ -441,7 +473,7 @@ module Transpec
               rewritten_source.should == expected_source
             end
 
-            it 'adds record ' +
+            it 'adds record ' \
                '`obj.stub(:message => value)` -> `allow(obj).to receive(:message).and_return(value)`' do
               record.original_syntax.should  == 'obj.stub(:message => value)'
               record.converted_syntax.should == 'allow(obj).to receive(:message).and_return(value)'
@@ -474,7 +506,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`obj.stub(:message => value)` -> `allow(obj).to receive(:message).and_return(value)`' do
             record.original_syntax.should  == 'obj.stub(:message => value)'
             record.converted_syntax.should == 'allow(obj).to receive(:message).and_return(value)'
@@ -503,12 +535,12 @@ module Transpec
             END
           end
 
-          it 'converts into `allow(subject).to receive(:a_method).and_return(a_value)` ' +
+          it 'converts into `allow(subject).to receive(:a_method).and_return(a_value)` ' \
              'and `allow(subject).to receive(:b_method).and_return(b_value)` form' do
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`obj.stub(:message => value)` -> `allow(obj).to receive(:message).and_return(value)`' do
             record.original_syntax.should  == 'obj.stub(:message => value)'
             record.converted_syntax.should == 'allow(obj).to receive(:message).and_return(value)'
@@ -685,7 +717,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `Klass.any_instance.stub(:message)` ' +
+          it 'adds record `Klass.any_instance.stub(:message)` ' \
              '-> `allow_any_instance_of(obj).to receive(:message)`' do
             record.original_syntax.should  == 'Klass.any_instance.stub(:message)'
             record.converted_syntax.should == 'allow_any_instance_of(Klass).to receive(:message)'
@@ -756,14 +788,14 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `Klass.any_instance.stub(:message)` ' +
+          it 'adds record `Klass.any_instance.stub(:message)` ' \
              '-> `allow_any_instance_of(obj).to receive(:message)`' do
             record.original_syntax.should  == 'Klass.any_instance.stub(:message)'
             record.converted_syntax.should == 'allow_any_instance_of(Klass).to receive(:message)'
           end
         end
 
-        context 'when it is `variable.any_instance.stub(:method)` form ' +
+        context 'when it is `variable.any_instance.stub(:method)` form ' \
                 'and the variable is an AnyInstance::Recorder' do
           context 'with runtime information' do
             include_context 'dynamic analysis objects'
@@ -794,7 +826,7 @@ module Transpec
               rewritten_source.should == expected_source
             end
 
-            it 'adds record `Klass.any_instance.stub(:message)` ' +
+            it 'adds record `Klass.any_instance.stub(:message)` ' \
                '-> `allow_any_instance_of(obj).to receive(:message)`' do
               record.original_syntax.should  == 'Klass.any_instance.stub(:message)'
               record.converted_syntax.should == 'allow_any_instance_of(Klass).to receive(:message)'
@@ -1059,7 +1091,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `Klass.any_instance.stub(:message) { |arg| }` ' +
+          it 'adds record `Klass.any_instance.stub(:message) { |arg| }` ' \
              '-> `Klass.any_instance.stub(:message) { |instance, arg| }`' do
             record.original_syntax.should  == 'Klass.any_instance.stub(:message) { |arg| }'
             record.converted_syntax.should == 'Klass.any_instance.stub(:message) { |instance, arg| }'

data/spec/transpec/syntax/oneliner_should_spec.rb

@@ -281,7 +281,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do subject.size.should == n end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do subject.size.should == n end"
@@ -311,7 +311,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `it { should_not have(n).items }`' +
+          it 'adds record `it { should_not have(n).items }`' \
              ' -> `it \'does not have n items\' do subject.size.should_not == n end`' do
             record.original_syntax.should  == 'it { should_not have(n).items }'
             record.converted_syntax.should == "it 'does not have n items' do subject.size.should_not == n end"
@@ -341,7 +341,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do subject.size.should == n end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do subject.size.should == n end"
@@ -371,7 +371,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do subject.size.should == n end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do subject.size.should == n end"
@@ -401,7 +401,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do subject.size.should == n end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do subject.size.should == n end"
@@ -431,7 +431,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `it { should_not have(n).items }`' +
+          it 'adds record `it { should_not have(n).items }`' \
              ' -> `it \'does not have n items\' do subject.size.should_not == n end`' do
             record.original_syntax.should  == 'it { should_not have(n).items }'
             record.converted_syntax.should == "it 'does not have n items' do subject.size.should_not == n end"
@@ -463,7 +463,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do subject.size.should == n end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do subject.size.should == n end"
@@ -495,7 +495,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it \'...\' { should have(n).items }` -> `it \'...\' do subject.size.should == n end`' do
             record.original_syntax.should  == "it '...' do should have(n).items end"
             record.converted_syntax.should == "it '...' do subject.size.should == n end"
@@ -525,7 +525,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `it { should have_at_least(n).items }` ' +
+          it 'adds record `it { should have_at_least(n).items }` ' \
              '-> `it \'has at least n items\' do subject.size.should >= n end`' do
             record.original_syntax.should  == 'it { should have_at_least(n).items }'
             record.converted_syntax.should == "it 'has at least n items' do subject.size.should >= n end"
@@ -571,7 +571,7 @@ module Transpec
                 rewritten_source.should == expected_source
               end
 
-              it 'adds record `it { should have(n).words }` ' +
+              it 'adds record `it { should have(n).words }` ' \
                  '-> `it \'has n words\' do subject.words.size.should == n end`' do
                 record.original_syntax.should  == 'it { should have(n).words }'
                 record.converted_syntax.should == "it 'has n words' do subject.words.size.should == n end"
@@ -611,7 +611,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record ' +
+          it 'adds record ' \
              '`it { should have(n).items }` -> `it \'has n items\' do expect(subject.size).to eq(n) end`' do
             record.original_syntax.should  == 'it { should have(n).items }'
             record.converted_syntax.should == "it 'has n items' do expect(subject.size).to eq(n) end"
@@ -641,7 +641,7 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `it { should_not have(n).items }`' +
+          it 'adds record `it { should_not have(n).items }`' \
              ' -> `it \'does not have n items\' do expect(subject.size).not_to eq(n) end`' do
             record.original_syntax.should  == 'it { should_not have(n).items }'
             record.converted_syntax.should == "it 'does not have n items' do expect(subject.size).not_to eq(n) end"