transpec 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c531039bdc9609412069c33d3e89135b4b2f86
-  data.tar.gz: 8b4956401c3985d33cc37f6738141702eb9e6e86
+  metadata.gz: bea6a3efb55602879556ab0afcb57ff1afc5ad19
+  data.tar.gz: 4c9d3f104c8c8865565162539cee360343c6adc4
 SHA512:
-  metadata.gz: af7da633d3f8f61ca7966e1b86ac732bf037e47e78e7241270daadad59582fcaec334bfd37d9426ae817618c1474afc6fe9e488b12aca349fa6ccb615c5e11eb
-  data.tar.gz: e796cfb5e29b16ac5a636e0400771d4398d96a302676bfc4d7c19ad152d757d880348e5367a88c7f9e4835e7f8d560d9e589c31229705df020987234500e45a6
+  metadata.gz: 5c07e7a00f5a850dd2e67e02321d0ec2b4e5243f53de50af9d4d7176fc0747a0384a2bdd1eaab1e34b184f8d9668cfa11362030578dbc963def63592b52bb9eb
+  data.tar.gz: ef36576b3df8b682a823b81e0164b0be5cdc35fb0ff7219659e8487813acf4058c3a81b0ef60bb4a86cf09f15f62bd919dd68e464783f08162f82aae62496737

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v2.2.4
+
+* Avoid crash on invalid `expect` syntax expectations (e.g. `expect(obj)` without following `to` or `expect(obj).to` taking no matcher). ([#71](https://github.com/yujinakayama/transpec/issues/71))
+
 ## v2.2.3
 
 * Handle `its(:attr) { should have(n).items }`. ([#68](https://github.com/yujinakayama/transpec/pull/68))

data/lib/transpec/syntax/allow.rb

@@ -9,7 +9,7 @@ module Transpec
       include Mixin::ExpectBase
 
       def dynamic_analysis_target?
-        super && receiver_node.nil? && [:allow, :allow_any_instance_of].include?(method_name)
+        super && [:allow, :allow_any_instance_of].include?(method_name)
       end
 
       def method_name_for_instance

data/lib/transpec/syntax/expect.rb

@@ -14,7 +14,7 @@ module Transpec
       add_matcher RaiseError
 
       def dynamic_analysis_target?
-        super && receiver_node.nil? && [:expect, :expect_any_instance_of].include?(method_name)
+        super && [:expect, :expect_any_instance_of].include?(method_name)
       end
 
       def method_name_for_instance

data/lib/transpec/syntax/mixin/expect_base.rb

@@ -17,6 +17,10 @@ module Transpec
           add_matcher Receive
         end
 
+        def dynamic_analysis_target?
+          super && receiver_node.nil? && matcher_node
+        end
+
         def current_syntax_type
           :expect
         end
@@ -36,15 +40,21 @@ module Transpec
         end
 
         def to_node
+          return nil unless parent_node
+
           if parent_node.block_type? && parent_node.children.first.equal?(node)
             parent_node.parent_node
-          else
+          elsif parent_node.send_type? && parent_node.children.first.equal?(node)
             parent_node
+          else
+            nil
           end
         end
 
         def matcher_node
+          return nil unless to_node
           to_arg_node = to_node.children[2]
+          return nil unless to_arg_node
           Util.each_forward_chained_node(to_arg_node, :include_origin)
             .select(&:send_type?).to_a.last
         end

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 2
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/transpec/syntax/expect_spec.rb

@@ -9,6 +9,96 @@ module Transpec
       include_context 'parsed objects'
       include_context 'syntax object', Expect, :expect_object
 
+      describe '#conversion_target?' do
+        let(:target_node) do
+          ast.each_node do |node|
+            next unless node.send_type?
+            method_name = node.children[1]
+            next unless method_name == :expect
+            return node
+          end
+          fail 'No #expect node is found!'
+        end
+
+        let(:expect_object) do
+          Expect.new(target_node)
+        end
+
+        subject { expect_object.conversion_target? }
+
+        context 'when the #expect node is chained by #to' do
+          context 'and taking a matcher properly' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'is valid expectation' do
+                    expect(obj).to matcher
+                  end
+                end
+              END
+            end
+
+            it { should be_true }
+          end
+
+          context 'but taking no matcher' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'is invalid expectation' do
+                    expect(obj).to
+                  end
+                end
+              END
+            end
+
+            it { should be_false }
+          end
+        end
+
+        context 'when the #expect node is chained by #not_to' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is valid expectation' do
+                  expect(obj).not_to matcher
+                end
+              end
+            END
+          end
+
+          it { should be_true }
+        end
+
+        context 'when the #expect node is not chained' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is invalid expectation' do
+                  expect(obj)
+                end
+              end
+            END
+          end
+
+          it { should be_false }
+        end
+
+        context 'when the #expect node is not chained and taken as a argument by another method' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is invalid expectation' do
+                  do_something(expect(obj))
+                end
+              end
+            END
+          end
+
+          it { should be_false }
+        end
+      end
+
       describe '#subject_node' do
         context 'when the subject is a normal argument' do
           let(:source) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Yuji Nakayama