transpec 1.6.1 → 1.7.0

data/spec/transpec/option_parser_spec.rb

@@ -145,6 +145,16 @@ module Transpec
         end
       end
 
+      describe '-a/--no-yield-any-instance option' do
+        let(:args) { ['--no-yield-any-instance'] }
+
+        it 'sets Configuration#add_receiver_arg_to_any_instance_implementation_block? false' do
+          parser.parse(args)
+          configuration.add_receiver_arg_to_any_instance_implementation_block?
+            .should be_false
+        end
+      end
+
       describe '-p/--no-parentheses-matcher-arg option' do
         let(:args) { ['--no-parentheses-matcher-arg'] }
 

data/spec/transpec/rspec_version_spec.rb

@@ -7,7 +7,7 @@ module Transpec
   describe RSpecVersion do
     subject(:rspec_version) { RSpecVersion.new(version_string) }
 
-    shared_examples 'feature availability' do |method, expectations|
+    shared_examples 'version comparisons' do |method, expectations|
       describe "##{method}" do
         subject { rspec_version.send(method) }
 
@@ -23,8 +23,12 @@ module Transpec
       end
     end
 
-    [:be_truthy_available?, :yielded_example_available?].each do |method|
-      include_examples 'feature availability', method, [
+    [
+      :be_truthy_available?,
+      :yielded_example_available?,
+      :yielding_receiver_to_any_instance_implementation_block_available?
+    ].each do |method|
+      include_examples 'version comparisons', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', true],
         ['2.99.0.beta2', true],
@@ -36,7 +40,7 @@ module Transpec
     end
 
     [:oneliner_is_expected_available?].each do |method|
-      include_examples 'feature availability', method, [
+      include_examples 'version comparisons', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', true],
@@ -48,7 +52,7 @@ module Transpec
     end
 
     [:receive_messages_available?].each do |method|
-      include_examples 'feature availability', method, [
+      include_examples 'version comparisons', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', false],
@@ -60,7 +64,7 @@ module Transpec
     end
 
     [:receive_message_chain_available?, :non_should_matcher_protocol_available?].each do |method|
-      include_examples 'feature availability', method, [
+      include_examples 'version comparisons', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', false],
@@ -70,5 +74,15 @@ module Transpec
         ['3.0.0',        true]
       ]
     end
+
+    include_examples 'version comparisons', :migration_term_of_any_instance_implementation_block?, [
+      ['2.14.0',       false],
+      ['2.99.0.beta1', true],
+      ['2.99.0.beta2', true],
+      ['2.99.0',       true],
+      ['3.0.0.beta1',  false],
+      ['3.0.0.beta2',  false],
+      ['3.0.0',        false]
+    ]
   end
 end

data/spec/transpec/static_context_inspector_spec.rb

@@ -530,7 +530,7 @@ module Transpec
     end
 
     context 'when in a class in a block in #describe block' do
-       let(:source) do
+      let(:source) do
         <<-END
           describe 'foo' do
             it 'is an example' do
@@ -546,7 +546,7 @@ module Transpec
     end
 
     context 'when in an instance method in a class in a block in #describe block' do
-       let(:source) do
+      let(:source) do
         <<-END
           describe 'foo' do
             it 'is an example' do

data/spec/transpec/syntax/allow_spec.rb

@@ -0,0 +1,140 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/syntax/allow'
+
+module Transpec
+  class Syntax
+    describe Allow do
+      include_context 'parsed objects'
+      include_context 'syntax object', Allow, :allow_object
+
+      describe '#subject_node' do
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'is empty' do
+                allow(subject).to be_empty
+              end
+            end
+          END
+        end
+
+        it 'returns subject node' do
+          method_name = allow_object.subject_node.children[1]
+          method_name.should == :subject
+        end
+      end
+
+      describe '#matcher_node' do
+        context 'when the matcher is taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  allow(subject).to receive(:foo) { }
+                end
+              end
+            END
+          end
+
+          it 'returns send node of the matcher' do
+            method_name = allow_object.matcher_node.children[1]
+            method_name.should == :receive
+          end
+        end
+
+        context 'when the matcher is not taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  allow(subject).to be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns send node of the matcher' do
+            method_name = allow_object.matcher_node.children[1]
+            method_name.should == :be_empty
+          end
+        end
+      end
+
+      describe '#receive_matcher' do
+        subject { allow_object.receive_matcher }
+
+        context 'when it is taking #receive matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  allow(subject).to receive(:foo)
+                end
+              end
+            END
+          end
+
+          it 'returns an instance of Receive' do
+            should be_an(Receive)
+          end
+        end
+
+        context 'when it is taking any other matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  allow(subject).to be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
+
+      describe '#block_node' do
+        subject { allow_object.block_node }
+
+        context 'when the #to is taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  allow(subject).to receive(:foo) do |arg|
+                  end
+                end
+              end
+            END
+          end
+
+          it 'returns the block node' do
+            should be_block_type
+          end
+        end
+
+        context 'when the #to is not taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  allow(subject).to receive(:foo) { |arg|
+                  }
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
+    end
+  end
+end

data/spec/transpec/syntax/double_spec.rb

@@ -12,7 +12,7 @@ module Transpec
       describe '.conversion_target_node?' do
         let(:send_node) do
           ast.each_descendent_node do |node|
-            next unless node.type == :send
+            next unless node.send_type?
             method_name = node.children[1]
             next unless method_name == :double
             return node

data/spec/transpec/syntax/expect_spec.rb

@@ -27,19 +27,38 @@ module Transpec
       end
 
       describe '#matcher_node' do
-        let(:source) do
-          <<-END
-            describe 'example' do
-              it 'is empty' do
-                expect(subject).to be_empty
+        context 'when the matcher is taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  expect(subject).to receive(:foo) { }
+                end
               end
-            end
-          END
+            END
+          end
+
+          it 'returns send node of the matcher' do
+            method_name = expect_object.matcher_node.children[1]
+            method_name.should == :receive
+          end
         end
 
-        it 'returns matcher node' do
-          method_name = expect_object.matcher_node.children[1]
-          method_name.should == :be_empty
+        context 'when the matcher is not taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  expect(subject).to be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns send node of the matcher' do
+            method_name = expect_object.matcher_node.children[1]
+            method_name.should == :be_empty
+          end
         end
       end
 
@@ -78,6 +97,80 @@ module Transpec
           end
         end
       end
+
+      describe '#receive_matcher' do
+        subject { expect_object.receive_matcher }
+
+        context 'when it is taking #receive matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  expect(subject).to receive(:foo)
+                end
+              end
+            END
+          end
+
+          it 'returns an instance of Receive' do
+            should be_an(Receive)
+          end
+        end
+
+        context 'when it is taking any other matcher' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  expect(subject).to be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
+
+      describe '#block_node' do
+        subject { expect_object.block_node }
+
+        context 'when the #to is taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  expect(subject).to receive(:foo) do |arg|
+                  end
+                end
+              end
+            END
+          end
+
+          it 'returns the block node' do
+            should be_block_type
+          end
+        end
+
+        context 'when the #to is not taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives :foo' do
+                  expect(subject).to receive(:foo) { |arg|
+                  }
+                end
+              end
+            END
+          end
+
+          it 'returns nil' do
+            should be_nil
+          end
+        end
+      end
     end
   end
 end

data/spec/transpec/syntax/have_spec.rb

@@ -165,13 +165,13 @@ module Transpec
             let(:parenthesize_matcher_arg) { true }
 
             let(:expected_source) do
-            <<-END
+              <<-END
               describe 'example' do
                 it 'has 2 items' do
                   expect(collection.size).to eq(2)
                 end
               end
-            END
+              END
             end
 
             before do
@@ -192,13 +192,13 @@ module Transpec
               let(:parenthesize_matcher_arg) { false }
 
               let(:expected_source) do
-              <<-END
+                <<-END
               describe 'example' do
                 it 'has 2 items' do
                   expect(collection.size).to eq 2
                 end
               end
-              END
+                END
               end
 
               it 'converts into `expect(collection.size).to eq 2` form' do

data/spec/transpec/syntax/method_stub_spec.rb

@@ -15,7 +15,7 @@ module Transpec
       describe '.conversion_target_node?' do
         let(:send_node) do
           ast.each_descendent_node do |node|
-            next unless node.type == :send
+            next unless node.send_type?
             method_name = node.children[1]
             next unless method_name == :stub
             return node
@@ -1026,6 +1026,46 @@ module Transpec
           end
         end
       end
+
+      describe '#add_receiver_arg_to_any_instance_implementation_block!' do
+        before do
+          method_stub_object.add_receiver_arg_to_any_instance_implementation_block!
+        end
+
+        context 'when it is `Klass.any_instance.stub(:method) do |arg| .. end` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  Klass.any_instance.stub(:foo) do |arg|
+                  end
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  Klass.any_instance.stub(:foo) do |instance, arg|
+                  end
+                end
+              end
+            END
+          end
+
+          it 'converts into `Klass.any_instance.stub(:method) do |instance, arg| .. end` form' do
+            rewritten_source.should == expected_source
+          end
+
+          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| }'
+          end
+        end
+      end
     end
   end
 end