transpec 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eedcc59f7b98fb3c4c65cba1a0be3165d9a7624
-  data.tar.gz: 36621b66f200b3402caa0f31166d85e52f0e4c6c
+  metadata.gz: ce0f0f3624392da60bc26a32d10f32a93ed866af
+  data.tar.gz: c0492a785742c25c2f718c888253658b6fbe872d
 SHA512:
-  metadata.gz: ec7769b9ee175b13949e59e2f1b8c05422212bdf59ec5a4d0a6f9cf9107fa6a352474a2f3b60e895e476b054a90474e86c4cd33704983f360d3e6fdcb7aa826c
-  data.tar.gz: 894ca15f361e3393101470d8ea9ac70f4ebf81c46132396e02df028f835e79f91389aea4decab50fa429139ca90c2d4ec558720c1cf5ff67cb8fdcc1a75cdb24
+  metadata.gz: 069b02b6bfd111b9ac243fd0559c6281417ca8be7e0e40d9bbe10cbf46f1a63fc6819d31f0d439acaad3c2f60c0a5dc00eb3d0b59374a9e23d76f4b495829a40
+  data.tar.gz: 64212f1a93153c532e11dd6dc0d397a5f295c4064551663b8c43f2c70cac9f880bcf48b6893ef745a88fb3ec5378d7401384b23f91803708613f001b73519f2d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## v0.0.8
+
+* Support conversion from `not_to raise_error(SpecificErrorClass)` to `not_to raise_error`
+
 ## v0.0.7
 
 * Avoid confusing `Typhoeus.stub` with RSpec's `stub` ([#4](https://github.com/yujinakayama/transpec/issues/4))

data/lib/transpec/rewriter.rb

@@ -7,6 +7,7 @@ require 'transpec/syntax/be_close'
 require 'transpec/syntax/double'
 require 'transpec/syntax/matcher'
 require 'transpec/syntax/method_stub'
+require 'transpec/syntax/raise_error'
 require 'transpec/syntax/rspec_configure'
 require 'transpec/syntax/should'
 require 'transpec/syntax/should_receive'
@@ -127,6 +128,12 @@ module Transpec
       be_close.convert_to_be_within! if @configuration.replace_deprecated_method?
     end
 
+    def process_raise_error(raise_error)
+      if @configuration.replace_deprecated_method?
+        raise_error.remove_error_specification_with_negative_expectation!
+      end
+    end
+
     def process_rspec_configure(rspec_configure)
       if need_to_modify_expectation_syntax_configuration?(rspec_configure)
         rspec_configure.modify_expectation_syntaxes!(:expect)

data/lib/transpec/syntax/raise_error.rb

@@ -0,0 +1,36 @@
+# coding: utf-8
+
+require 'transpec/syntax'
+require 'transpec/syntax/send_node_syntax'
+
+module Transpec
+  class Syntax
+    class RaiseError < Syntax
+      include SendNodeSyntax
+
+      def remove_error_specification_with_negative_expectation!
+        return if positive?
+
+        _receiver_node, _method_name, *arg_nodes = *node
+        return if arg_nodes.empty?
+
+        remove(parentheses_range)
+      end
+
+      def positive?
+        expectation_method_name = parent_node.children[1]
+        [:should, :to].include?(expectation_method_name)
+      end
+
+      private
+
+      def self.target_receiver_node?(node)
+        node.nil?
+      end
+
+      def self.target_method_names
+        [:raise_error]
+      end
+    end
+  end
+end

data/lib/transpec/syntax/send_node_syntax.rb

@@ -32,6 +32,10 @@ module Transpec
       def arg_range
         arg_node.loc.expression
       end
+
+      def parentheses_range
+        selector_range.end.join(expression_range.end)
+      end
     end
   end
 end

data/lib/transpec/version.rb

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

data/spec/transpec/rewriter_spec.rb

@@ -419,6 +419,28 @@ module Transpec
       end
     end
 
+    describe '#process_raise_error' do
+      let(:raise_error_object) { double('raise_error_object').as_null_object }
+
+      context 'when Configuration#replace_deprecated_method? is true' do
+        before { configuration.replace_deprecated_method = true }
+
+        it 'invokes RaiseError#remove_error_specification_with_negative_expectation!' do
+          raise_error_object.should_receive(:remove_error_specification_with_negative_expectation!)
+          rewriter.process_raise_error(raise_error_object)
+        end
+      end
+
+      context 'when Configuration#replace_deprecated_method? is true' do
+        before { configuration.replace_deprecated_method = false }
+
+        it 'does not invoke BeClose#convert_to_be_within!' do
+          raise_error_object.should_not_receive(:remove_error_specification_with_negative_expectation!)
+          rewriter.process_raise_error(raise_error_object)
+        end
+      end
+    end
+
     describe '#process_rspec_configure' do
       let(:rspec_configure) { double('rspec_configure').as_null_object }
 

data/spec/transpec/syntax/raise_error_spec.rb

@@ -0,0 +1,193 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/syntax/raise_error'
+
+module Transpec
+  class Syntax
+    describe RaiseError do
+      include_context 'parsed objects'
+
+      subject(:raise_error_object) do
+        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+          next unless RaiseError.target_node?(node)
+          return RaiseError.new(
+            node,
+            ancestor_nodes,
+            in_example_group_context?,
+            source_rewriter
+          )
+        end
+        fail 'No raise_error node is found!'
+      end
+
+      let(:in_example_group_context?) { true }
+
+      describe '#remove_error_specification_with_negative_expectation!' do
+        before do
+          raise_error_object.remove_error_specification_with_negative_expectation!
+        end
+
+        context 'when it is `lambda { ... }.should raise_error(SomeErrorClass)` form' do
+          let(:source) do
+            <<-END
+              it 'raises SomeErrorClass' do
+                lambda { do_something }.should raise_error(SomeErrorClass)
+              end
+            END
+          end
+
+          it 'does nothing' do
+            rewritten_source.should == source
+          end
+        end
+
+        context 'when it is `expect { ... }.to raise_error(SomeErrorClass)` form' do
+          let(:source) do
+            <<-END
+              it 'raises SomeErrorClass' do
+                expect { do_something }.to raise_error(SomeErrorClass)
+              end
+            END
+          end
+
+          it 'does nothing' do
+            rewritten_source.should == source
+          end
+        end
+
+        context 'when it is `lambda { ... }.should_not raise_error(SomeErrorClass)` form' do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                lambda { do_something }.should_not raise_error(SomeErrorClass)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                lambda { do_something }.should_not raise_error
+              end
+            END
+          end
+
+          it 'converts into `lambda { ... }.should_not raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `expect { ... }.not_to raise_error(SomeErrorClass)` form' do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error(SomeErrorClass)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error
+              end
+            END
+          end
+
+          it 'converts into `expect { ... }.not_to raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `expect { ... }.to_not raise_error(SomeErrorClass)` form' do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.to_not raise_error(SomeErrorClass)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.to_not raise_error
+              end
+            END
+          end
+
+          it 'converts into `expect { ... }.to_not raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `expect { ... }.not_to raise_error SomeErrorClass` form' do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error SomeErrorClass
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error
+              end
+            END
+          end
+
+          it 'converts into `expect { ... }.not_to raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context "when it is `expect { ... }.not_to raise_error(SomeErrorClass, 'message')` form" do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error(SomeErrorClass, 'message')
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error
+              end
+            END
+          end
+
+          it 'converts into `expect { ... }.not_to raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context "when it is `expect { ... }.not_to raise_error(nil, 'message')` form" do
+          let(:source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error(nil, 'message')
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'does not raise error' do
+                expect { do_something }.not_to raise_error
+              end
+            END
+          end
+
+          it 'converts into `expect { ... }.not_to raise_error` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yuji Nakayama
@@ -14,140 +14,140 @@ dependencies:
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 description: Transpec automatically converts your specs into latest RSpec syntax with
@@ -159,9 +159,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -185,6 +185,7 @@ files:
 - lib/transpec/syntax/expectizable.rb
 - lib/transpec/syntax/matcher.rb
 - lib/transpec/syntax/method_stub.rb
+- lib/transpec/syntax/raise_error.rb
 - lib/transpec/syntax/rspec_configure.rb
 - lib/transpec/syntax/send_node_syntax.rb
 - lib/transpec/syntax/should.rb
@@ -207,6 +208,7 @@ files:
 - spec/transpec/syntax/double_spec.rb
 - spec/transpec/syntax/matcher_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
+- spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb
 - spec/transpec/syntax/should_receive_spec.rb
 - spec/transpec/syntax/should_spec.rb
@@ -222,12 +224,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -253,6 +255,7 @@ test_files:
 - spec/transpec/syntax/double_spec.rb
 - spec/transpec/syntax/matcher_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
+- spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb
 - spec/transpec/syntax/should_receive_spec.rb
 - spec/transpec/syntax/should_spec.rb