transpec 1.8.0 → 1.9.0

data/spec/transpec/syntax/method_stub_spec.rb

@@ -985,9 +985,9 @@ module Transpec
         end
       end
 
-      describe '#remove_allowance_for_no_message!' do
+      describe '#remove_no_message_allowance!' do
         before do
-          method_stub_object.remove_allowance_for_no_message!
+          method_stub_object.remove_no_message_allowance!
         end
 
         context 'when it is `subject.stub(:method).any_number_of_times` form' do
@@ -1014,6 +1014,12 @@ module Transpec
           it 'removes `.any_number_of_times`' do
             rewritten_source.should == expected_source
           end
+
+          it 'adds record ' \
+             '`obj.stub(:message).any_number_of_times` -> `obj.stub(:message)`' do
+            record.original_syntax.should  == 'obj.stub(:message).any_number_of_times'
+            record.converted_syntax.should == 'obj.stub(:message)'
+          end
         end
 
         context 'when it is `subject.stub(:method).at_least(0)` form' do
@@ -1040,6 +1046,12 @@ module Transpec
           it 'removes `.at_least(0)`' do
             rewritten_source.should == expected_source
           end
+
+          it 'adds record ' \
+             '`obj.stub(:message).at_least(0)` -> `obj.stub(:message)`' do
+            record.original_syntax.should  == 'obj.stub(:message).at_least(0)'
+            record.converted_syntax.should == 'obj.stub(:message)'
+          end
         end
 
         context 'when it is `subject.stub(:method)` form' do
@@ -1059,6 +1071,91 @@ module Transpec
         end
       end
 
+      describe '#remove_useless_and_return!' do
+        before do
+          method_stub_object.remove_useless_and_return!
+        end
+
+        context 'when it is `subject.stub(:method).and_return { value }` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo).and_return { 1 }
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo) { 1 }
+                end
+              end
+            END
+          end
+
+          it 'converts into `subject.stub(:method) { value }` form' do
+            rewritten_source.should == expected_source
+          end
+
+          it 'adds record `obj.stub(:message).and_return { value }` -> `obj.stub(:message) { value }`' do
+            record.original_syntax.should  == 'obj.stub(:message).and_return { value }'
+            record.converted_syntax.should == 'obj.stub(:message) { value }'
+          end
+        end
+
+        context 'when it is `subject.stub(:method).and_return` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  subject.stub(:foo).and_return
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo' do
+                  subject.stub(:foo)
+                end
+              end
+            END
+          end
+
+          it 'converts into `subject.stub(:method)` form' do
+            rewritten_source.should == expected_source
+          end
+
+          it 'adds record `obj.stub(:message).and_return` -> `obj.stub(:message)`' do
+            record.original_syntax.should  == 'obj.stub(:message).and_return'
+            record.converted_syntax.should == 'obj.stub(:message)'
+          end
+        end
+
+        context 'when it is `subject.stub(:method).and_return(value)` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo).and_return(1)
+                end
+              end
+            END
+          end
+
+          it 'does nothing' do
+            rewritten_source.should == source
+            record.should be_nil
+          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!

data/spec/transpec/syntax/operator_matcher_spec.rb

@@ -11,61 +11,22 @@ module Transpec
       include_context 'parsed objects'
       include_context 'syntax object', Should, :should_object
 
-      subject(:matcher) do
-        OperatorMatcher.new(should_object.matcher_node, source_rewriter, runtime_data)
-      end
-
+      subject(:matcher) { should_object.operator_matcher }
       let(:record) { matcher.report.records.first }
 
       describe '#method_name' do
-        context 'when it is operator matcher' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'is 1' do
-                  subject.should == 1
-                end
+        let(:source) do
+          <<-END
+            describe 'example' do
+              it 'is 1' do
+                subject.should == 1
               end
-            END
-          end
-
-          # (block
-          #   (send nil :it
-          #     (str "is 1"))
-          #   (args)
-          #   (send
-          #     (send
-          #       (send nil :subject) :should) :==
-          #     (int 1)))
-
-          it 'returns the method name' do
-            matcher.method_name.should == :==
-          end
+            end
+          END
         end
 
-        context 'when it is non-operator matcher' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'is 1' do
-                  subject.should eq(1)
-                end
-              end
-            END
-          end
-
-          # (block
-          #   (send nil :it
-          #     (str "is 1"))
-          #   (args)
-          #   (send
-          #     (send nil :subject) :should
-          #     (send nil :eq
-          #       (int 1))))
-
-          it 'returns the method name' do
-            matcher.method_name.should == :eq
-          end
+        it 'returns the method name' do
+          matcher.method_name.should == :==
         end
       end
 
@@ -665,7 +626,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'is 1' do
-                  subject.should eq(1)
+                  subject.should ==(1)
                 end
               end
             END
@@ -681,7 +642,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'is 1' do
-                  subject.should eq 1
+                  subject.should == 1
                 end
               end
             END
@@ -694,7 +655,7 @@ module Transpec
               <<-END
               describe 'example' do
                 it 'is 1' do
-                  subject.should eq(1)
+                  subject.should ==(1)
                 end
               end
               END
@@ -712,7 +673,7 @@ module Transpec
               <<-END
               describe 'example' do
                 it 'is 1' do
-                  subject.should eq 1
+                  subject.should == 1
                 end
               end
               END
@@ -724,38 +685,12 @@ module Transpec
           end
         end
 
-        context 'when its multiple arguments are not in parentheses' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'contains 1 and 2' do
-                  subject.should include 1, 2
-                end
-              end
-            END
-          end
-
-          let(:expected_source) do
-            <<-END
-              describe 'example' do
-                it 'contains 1 and 2' do
-                  subject.should include(1, 2)
-                end
-              end
-            END
-          end
-
-          it 'inserts parentheses' do
-            rewritten_source.should == expected_source
-          end
-        end
-
         context 'when its argument is a string literal' do
           let(:source) do
             <<-END
               describe 'example' do
                 it "is 'string'" do
-                  subject.should eq 'string'
+                  subject.should == 'string'
                 end
               end
             END
@@ -765,7 +700,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it "is 'string'" do
-                  subject.should eq('string')
+                  subject.should ==('string')
                 end
               end
             END
@@ -781,7 +716,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'returns the document' do
-                  subject.should eq <<-HEREDOC
+                  subject.should == <<-HEREDOC
                   foo
                   HEREDOC
                 end
@@ -808,7 +743,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'returns the document' do
-                  subject.should eq <<-HEREDOC.gsub('foo', 'bar')
+                  subject.should == <<-HEREDOC.gsub('foo', 'bar')
                   foo
                   HEREDOC
                 end
@@ -838,7 +773,7 @@ module Transpec
             <<-'END'
               it 'returns the document' do
                 string = 'foo'
-                subject.should eq <<-HEREDOC
+                subject.should == <<-HEREDOC
                 #{string}
                 HEREDOC
               end

data/spec/transpec/syntax/receive_spec.rb

@@ -12,9 +12,203 @@ module Transpec
       include_context 'syntax object', Expect, :expect_object
       include_context 'syntax object', Allow, :allow_object
 
-      describe '#add_receiver_arg_to_any_instance_implementation_block!' do
-        let(:record) { receive_object.report.records.last }
+      let(:record) { receive_object.report.records.last }
 
+      describe '#remove_useless_and_return!' do
+        before do
+          receive_object.remove_useless_and_return!
+        end
+
+        context 'with #expect' do
+          let(:receive_object) { expect_object.receive_matcher }
+
+          context 'when it is `expect(obj).to receive(:method).and_return { value }` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect(subject).to receive(:foo).and_return { 1 }
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect(subject).to receive(:foo) { 1 }
+                  end
+                end
+              END
+            end
+
+            it 'converts into `expect(obj).to receive(:method) { value }` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `expect(obj).to receive(:message).and_return { value }` ' \
+               '-> `expect(obj).to receive(:message) { value }`' do
+              record.original_syntax.should  == 'expect(obj).to receive(:message).and_return { value }'
+              record.converted_syntax.should == 'expect(obj).to receive(:message) { value }'
+            end
+          end
+
+          context 'when it is `expect(obj).to receive(:method).and_return do value end` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect(subject).to receive(:foo).and_return do
+                      1
+                    end
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect(subject).to receive(:foo) do
+                      1
+                    end
+                  end
+                end
+              END
+            end
+
+            it 'converts into `expect(obj).to receive(:method) do value end` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `expect(obj).to receive(:message).and_return` ' \
+               '-> `expect(obj).to receive(:message)`' do
+              record.original_syntax.should  == 'expect(obj).to receive(:message).and_return'
+              record.converted_syntax.should == 'expect(obj).to receive(:message)'
+            end
+          end
+
+          context 'when it is `expect_any_instance_of(Klass).to receive(:method).and_return { value }` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect_any_instance_of(Klass).to receive(:foo).and_return { 1 }
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo and returns 1' do
+                    expect_any_instance_of(Klass).to receive(:foo) { 1 }
+                  end
+                end
+              END
+            end
+
+            it 'converts into `expect_any_instance_of(Klass).to receive(:method) { value }` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `expect(obj).to receive(:message).and_return` ' \
+               '-> `expect(obj).to receive(:message)`' do
+              record.original_syntax.should  == 'expect(obj).to receive(:message).and_return { value }'
+              record.converted_syntax.should == 'expect(obj).to receive(:message) { value }'
+            end
+          end
+
+          context 'when it is `expect(obj).to receive(:method).and_return` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'responds to #foo' do
+                    expect(subject).to receive(:foo).and_return
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'responds to #foo' do
+                    expect(subject).to receive(:foo)
+                  end
+                end
+              END
+            end
+
+            it 'converts into `expect(obj).to receive(:method)` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `expect(obj).to receive(:message).and_return` -> `expect(obj).to receive(:message)`' do
+              record.original_syntax.should  == 'expect(obj).to receive(:message).and_return'
+              record.converted_syntax.should == 'expect(obj).to receive(:message)'
+            end
+          end
+
+          context 'when it is `expect(obj).to receive(:message).and_return(value)` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'responds to #foo and returns 1' do
+                    expect(obj).to receive(:message).and_return(1)
+                  end
+                end
+              END
+            end
+
+            it 'does nothing' do
+              rewritten_source.should == source
+              record.should be_nil
+            end
+          end
+        end
+
+        context 'with #allow' do
+          let(:receive_object) { allow_object.receive_matcher }
+
+          context 'when it is `allow(obj).to receive(:method).and_return { value }` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'responds to #foo and returns 1' do
+                    allow(subject).to receive(:foo).and_return { 1 }
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'responds to #foo and returns 1' do
+                    allow(subject).to receive(:foo) { 1 }
+                  end
+                end
+              END
+            end
+
+            it 'converts into `allow(obj).to receive(:method) { value }` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `allow(obj).to receive(:message).and_return { value }` ' \
+               '-> `allow(obj).to receive(:message) { value }`' do
+              record.original_syntax.should  == 'allow(obj).to receive(:message).and_return { value }'
+              record.converted_syntax.should == 'allow(obj).to receive(:message) { value }'
+            end
+          end
+        end
+      end
+
+      describe '#add_receiver_arg_to_any_instance_implementation_block!' do
         before do
           receive_object.add_receiver_arg_to_any_instance_implementation_block!
         end
@@ -56,6 +250,41 @@ module Transpec
             end
           end
 
+          context 'when it is `expect_any_instance_of(Klass).to receive(:method).once do |arg| .. end` form' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo' do
+                    expect_any_instance_of(Klass).to receive(:foo).once do |arg|
+                    end
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'receives #foo' do
+                    expect_any_instance_of(Klass).to receive(:foo).once do |instance, arg|
+                    end
+                  end
+                end
+              END
+            end
+
+            it 'converts into ' \
+               '`expect_any_instance_of(Klass).to receive(:method).once do |instance, arg| .. end` form' do
+              rewritten_source.should == expected_source
+            end
+
+            it 'adds record `expect_any_instance_of(Klass).to receive(:message) { |arg| }` ' \
+               '-> `Klass.any_instance.should_receive(:message) { |instance, arg| }`' do
+              record.original_syntax.should  == 'expect_any_instance_of(Klass).to receive(:message) { |arg| }'
+              record.converted_syntax.should == 'expect_any_instance_of(Klass).to receive(:message) { |instance, arg| }'
+            end
+          end
+
           context 'when it is `expect_any_instance_of(Klass).to receive(:method) { |arg| .. }` form' do
             let(:source) do
               <<-END