transpec 1.9.3 → 1.10.0

data/spec/transpec/option_parser_spec.rb

@@ -65,8 +65,9 @@ module Transpec
           ['oneliner',       :convert_oneliner?],
           ['should_receive', :convert_should_receive?],
           ['stub',           :convert_stub?],
-          ['have_items',     :convert_have_items],
-          ['its',            :convert_its],
+          ['have_items',     :convert_have_items?],
+          ['its',            :convert_its?],
+          ['pending',        :convert_pending?],
           ['deprecated',     :convert_deprecated_method?]
         ].each do |cli_type, config_attr|
           context "when #{cli_type.inspect} is specified" do

data/spec/transpec/report_spec.rb

@@ -10,10 +10,10 @@ module Transpec
     subject(:report) { Report.new }
 
     before do
-      report.records << Record.new('obj.stub(:message)', 'allow(obj).to receive(:message)')
+      report.records << Record.new('obj.stub(:message)', 'allow(obj).to receive(:message)', double('annotation'))
       report.records << Record.new('obj.should', 'expect(obj).to')
-      report.records << Record.new('obj.should', 'expect(obj).to')
-      report.context_errors << ContextError.new(double('range'), '#should', '#expect')
+      report.records << Record.new('obj.should', 'expect(obj).to', double('annotation'))
+      report.conversion_errors << ContextError.new('#should', '#expect', double('range'))
     end
 
     describe '#unique_record_counts' do
@@ -81,7 +81,36 @@ module Transpec
 
     describe '#stats' do
       it 'returns stats string' do
-        report.stats.should == '3 conversions, 1 incomplete, 0 errors'
+        report.stats.should == '3 conversions, 1 incomplete, 2 cautions, 0 errors'
+      end
+    end
+
+    describe '#<<' do
+      subject(:concated_report) { report << another_report }
+
+      let(:another_report) do
+        report = Report.new
+        report.records << Record.new('obj.stub(:message)', 'allow(obj).to receive(:message)')
+        report.conversion_errors << ContextError.new('#should', '#expect', double('range'))
+        report.conversion_errors << ContextError.new('#stub', '#allow', double('range'))
+        report.syntax_errors << double('syntax error')
+        report
+      end
+
+      it 'returns the receiver' do
+        concated_report.should equal(report)
+      end
+
+      it 'concats records' do
+        concated_report.should have(4).records
+      end
+
+      it 'concats conversion errors' do
+        concated_report.should have(3).conversion_errors
+      end
+
+      it 'concats syntax errors' do
+        concated_report.should have(1).syntax_errors
       end
     end
   end

data/spec/transpec/rspec_version_spec.rb

@@ -39,7 +39,10 @@ module Transpec
       ]
     end
 
-    [:oneliner_is_expected_available?].each do |method|
+    [
+      :oneliner_is_expected_available?,
+      :skip_available?
+    ].each do |method|
       include_examples 'version comparisons', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
@@ -75,7 +78,7 @@ module Transpec
       ]
     end
 
-    include_examples 'version comparisons', :migration_term_of_any_instance_implementation_block?, [
+    include_examples 'version comparisons', :rspec_2_99?, [
       ['2.14.0',       false],
       ['2.99.0.beta1', true],
       ['2.99.0.beta2', true],

data/spec/transpec/syntax/current_example_spec.rb

@@ -0,0 +1,267 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/syntax/current_example'
+
+module Transpec
+  class Syntax
+    describe CurrentExample do
+      include_context 'parsed objects'
+      include_context 'syntax object', CurrentExample, :current_example_object
+
+      let(:record) { current_example_object.report.records.last }
+
+      describe '#convert!' do
+        before do
+          current_example_object.convert! unless example.metadata[:no_auto_convert]
+        end
+
+        (RSpecDSL::EXAMPLE_METHODS + RSpecDSL::HOOK_METHODS).each do |method|
+          context "when it is `#{method} do example end` form" do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  #{method} do
+                    do_something if example.metadata[:foo]
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  #{method} do |example|
+                    do_something if example.metadata[:foo]
+                  end
+                end
+              END
+            end
+
+            it "converts into `#{method} do |example| example end` form" do
+              rewritten_source.should == expected_source
+            end
+
+            it "adds record `#{method} { example }` -> `#{method} { |example| example }`" do
+              record.original_syntax.should  == "#{method} { example }"
+              record.converted_syntax.should == "#{method} { |example| example }"
+            end
+          end
+        end
+
+        RSpecDSL::HELPER_METHODS.each do |method|
+          context "when it is `#{method}(:name) do example end` form" do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  #{method}(:name) do
+                    do_something if example.metadata[:foo]
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  #{method}(:name) do |example|
+                    do_something if example.metadata[:foo]
+                  end
+                end
+              END
+            end
+
+            it "converts into `#{method}(:name) do |example| example end` form" do
+              rewritten_source.should == expected_source
+            end
+
+            it "adds record `#{method}(:name) { example }` -> `#{method}(:name) { |example| example }`" do
+              record.original_syntax.should  == "#{method}(:name) { example }"
+              record.converted_syntax.should == "#{method}(:name) { |example| example }"
+            end
+          end
+        end
+
+        context 'when it is `after { example }` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                after {
+                  do_something if example.metadata[:foo]
+                }
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                after { |example|
+                  do_something if example.metadata[:foo]
+                }
+              end
+            END
+          end
+
+          it 'converts into `after { |example| example }` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `after do running_example end` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                after do
+                  do_something if running_example.metadata[:foo]
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                after do |example|
+                  do_something if example.metadata[:foo]
+                end
+              end
+            END
+          end
+
+          it 'converts into `after do |example| example end` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when the wrapper block contains multiple invocation of `example`', :no_auto_convert do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                after do
+                  do_something if example.metadata[:foo]
+                  puts example.description
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                after do |example|
+                  do_something if example.metadata[:foo]
+                  puts example.description
+                end
+              end
+            END
+          end
+
+          let(:current_example_objects) do
+            ast.each_node.reduce([]) do |objects, node|
+              if CurrentExample.conversion_target_node?(node)
+                objects << CurrentExample.new(node, source_rewriter, runtime_data)
+              end
+              objects
+            end
+          end
+
+          it 'adds only a block argument' do
+            current_example_objects.size.should eq(2)
+            current_example_objects.each(&:convert!)
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `around do |ex| example end` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                around do |ex|
+                  do_something if example.metadata[:foo]
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                around do |ex|
+                  do_something if ex.metadata[:foo]
+                end
+              end
+            END
+          end
+
+          it 'converts into `around do |ex| ex end` form' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context "when it is `example 'it does something' do do_something end` form", :no_auto_convert do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                example 'it does something' do
+                  do_something
+                end
+              end
+            END
+          end
+
+          it 'does nothing' do
+            rewritten_source.should == source
+          end
+        end
+
+        context 'when it is `def helper_method example; end` form' do
+          let(:source) do
+            <<-END
+              module Helper
+                def display_description
+                  puts example.description
+                end
+              end
+
+              describe 'example' do
+                include Helper
+
+                after do
+                  display_description
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              module Helper
+                def display_description
+                  puts RSpec.current_example.description
+                end
+              end
+
+              describe 'example' do
+                include Helper
+
+                after do
+                  display_description
+                end
+              end
+            END
+          end
+
+          it 'converts into `def helper_method RSpec.current_example; end` form' do
+            rewritten_source.should == expected_source
+          end
+
+          it 'adds record `def helper_method example; end` -> `def helper_method RSpec.current_example; end`' do
+            record.original_syntax.should  == 'def helper_method example; end'
+            record.converted_syntax.should == 'def helper_method RSpec.current_example; end'
+          end
+        end
+      end
+    end
+  end
+end

data/spec/transpec/syntax/example_spec.rb

@@ -2,181 +2,164 @@
 
 require 'spec_helper'
 require 'transpec/syntax/example'
+require 'ast'
 
 module Transpec
   class Syntax
     describe Example do
+      include ::AST::Sexp
       include_context 'parsed objects'
       include_context 'syntax object', Example, :example_object
 
       let(:record) { example_object.report.records.last }
 
-      describe '#convert!' do
-        before do
-          example_object.convert! unless example.metadata[:no_auto_convert]
-        end
-
-        (RSpecDSL::EXAMPLE_METHODS + RSpecDSL::HOOK_METHODS).each do |method|
-          context "when it is `#{method} do example end` form" do
-            let(:source) do
-              <<-END
-                describe 'example' do
-                  #{method} do
-                    do_something if example.metadata[:foo]
-                  end
-                end
-              END
-            end
-
-            let(:expected_source) do
-              <<-END
-                describe 'example' do
-                  #{method} do |example|
-                    do_something if example.metadata[:foo]
-                  end
-                end
-              END
-            end
-
-            it "converts into `#{method} do |example| example end` form" do
-              rewritten_source.should == expected_source
-            end
+      describe '.conversion_target_node?' do
+        subject { Example.conversion_target_node?(pending_node, runtime_data) }
 
-            it "adds record `#{method} { example }` -> `#{method} { |example| example }`" do
-              record.original_syntax.should  == "#{method} { example }"
-              record.converted_syntax.should == "#{method} { |example| example }"
-            end
+        let(:pending_node) do
+          ast.each_descendent_node do |node|
+            next unless node.send_type?
+            method_name = node.children[1]
+            return node if method_name == :pending
           end
+          fail 'No #pending node is found!'
         end
 
-        RSpecDSL::HELPER_METHODS.each do |method|
-          context "when it is `#{method}(:name) do example end` form" do
-            let(:source) do
-              <<-END
-                describe 'example' do
-                  #{method}(:name) do
-                    do_something if example.metadata[:foo]
-                  end
-                end
-              END
-            end
-
-            let(:expected_source) do
-              <<-END
-                describe 'example' do
-                  #{method}(:name) do |example|
-                    do_something if example.metadata[:foo]
-                  end
+        context 'when #pending example node is passed' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                pending 'will be skipped' do
                 end
-              END
-            end
+              end
+            END
+          end
 
-            it "converts into `#{method}(:name) do |example| example end` form" do
-              rewritten_source.should == expected_source
-            end
+          context 'without runtime information' do
+            it { should be_true }
+          end
 
-            it "adds record `#{method}(:name) { example }` -> `#{method}(:name) { |example| example }`" do
-              record.original_syntax.should  == "#{method}(:name) { example }"
-              record.converted_syntax.should == "#{method}(:name) { |example| example }"
-            end
+          context 'with runtime information' do
+            include_context 'dynamic analysis objects'
+            it { should be_true }
           end
         end
 
-        context 'when it is `after { example }` form' do
+        context 'when #pending specification node inside of an example is passed' do
           let(:source) do
             <<-END
               describe 'example' do
-                after {
-                  do_something if example.metadata[:foo]
-                }
+                it 'will be skipped' do
+                  pending
+                end
               end
             END
           end
 
-          let(:expected_source) do
+          context 'without runtime information' do
+            it { should be_false }
+          end
+
+          context 'with runtime information' do
+            include_context 'dynamic analysis objects'
+            it { should be_false }
+          end
+        end
+      end
+
+      describe '#metadata_key_nodes' do
+        subject { example_object.metadata_key_nodes }
+
+        context 'when it is `it { }` form' do
+          let(:source) do
             <<-END
               describe 'example' do
-                after { |example|
-                  do_something if example.metadata[:foo]
-                }
+                it { do_something }
               end
             END
           end
 
-          it 'converts into `after { |example| example }` form' do
-            rewritten_source.should == expected_source
+          it 'returns empty array' do
+            should be_empty
           end
         end
 
-        context 'when it is `after do running_example end` form' do
+        context "when it is `it 'description' { }` form" do
           let(:source) do
             <<-END
               describe 'example' do
-                after do
-                  do_something if running_example.metadata[:foo]
+                it 'is an example' do
+                  do_something
                 end
               end
             END
           end
 
-          let(:expected_source) do
+          it 'returns empty array' do
+            should be_empty
+          end
+        end
+
+        context "when it is `it 'description', :foo { }` form" do
+          let(:source) do
             <<-END
               describe 'example' do
-                after do |example|
-                  do_something if example.metadata[:foo]
+                it 'is an example', :foo do
+                  do_something
                 end
               end
             END
           end
 
-          it 'converts into `after do |example| example end` form' do
-            rewritten_source.should == expected_source
+          it 'returns [(sym :foo)]' do
+            should == [s(:sym, :foo)]
           end
         end
 
-        context 'when the wrapper block contains multiple invocation of `example`', :no_auto_convert do
+        context "when it is `it 'description', foo: true { }` form" do
           let(:source) do
             <<-END
               describe 'example' do
-                after do
-                  do_something if example.metadata[:foo]
-                  puts example.description
+                it 'is an example', foo: true do
+                  do_something
                 end
               end
             END
           end
 
-          let(:expected_source) do
+          it 'returns [(sym :foo)]' do
+            should == [s(:sym, :foo)]
+          end
+        end
+
+        context "when it is `it 'description', :foo, :bar, baz: true { }` form" do
+          let(:source) do
             <<-END
               describe 'example' do
-                after do |example|
-                  do_something if example.metadata[:foo]
-                  puts example.description
+                it 'is an example', :foo, :bar, baz: true do
+                  do_something
                 end
               end
             END
           end
 
-          let(:example_objects) do
-            ast.each_node.reduce([]) do |objects, node|
-              objects << Example.new(node, source_rewriter, runtime_data) if Example.conversion_target_node?(node)
-              objects
-            end
+          it 'returns [s(:sym, :foo), s(:sym, :bar), s(:sym, :baz)]' do
+            should == [s(:sym, :foo), s(:sym, :bar), s(:sym, :baz)]
           end
+        end
+      end
 
-          it 'adds only a block argument' do
-            example_objects.size.should eq(2)
-            example_objects.each(&:convert!)
-            rewritten_source.should == expected_source
-          end
+      describe '#convert_pending_to_skip!' do
+        before do
+          example_object.convert_pending_to_skip!
         end
 
-        context 'when it is `around do |ex| example end` form' do
+        context "when it is `pending 'is an example' { }` form" do
           let(:source) do
             <<-END
               describe 'example' do
-                around do |ex|
-                  do_something if example.metadata[:foo]
+                pending 'will be skipped' do
+                  do_something
                 end
               end
             END
@@ -185,23 +168,28 @@ module Transpec
           let(:expected_source) do
             <<-END
               describe 'example' do
-                around do |ex|
-                  do_something if ex.metadata[:foo]
+                skip 'will be skipped' do
+                  do_something
                 end
               end
             END
           end
 
-          it 'converts into `around do |ex| ex end` form' do
+          it "converts into `skip 'is an example' { }` form" do
             rewritten_source.should == expected_source
           end
+
+          it "adds record `pending 'is an example' { }` -> `skip 'is an example' { }`" do
+            record.original_syntax.should  == "pending 'is an example' { }"
+            record.converted_syntax.should == "skip 'is an example' { }"
+          end
         end
 
-        context "when it is `example 'it does something' do do_something end` form", :no_auto_convert do
+        context "when it is `it 'is an example' { }` form" do
           let(:source) do
             <<-END
               describe 'example' do
-                example 'it does something' do
+                it 'is normal example' do
                   do_something
                 end
               end
@@ -213,20 +201,43 @@ module Transpec
           end
         end
 
-        context 'when it is `def helper_method example; end` form' do
+        context "when it is `it 'is an example', :pending { }` form" do
           let(:source) do
             <<-END
-              module Helper
-                def display_description
-                  puts example.description
+              describe 'example' do
+                it 'will be skipped', :pending do
+                  do_something
                 end
               end
+            END
+          end
 
+          let(:expected_source) do
+            <<-END
               describe 'example' do
-                include Helper
+                it 'will be skipped', :skip do
+                  do_something
+                end
+              end
+            END
+          end
+
+          it "converts into `it 'is an example', :skip { }` form" do
+            rewritten_source.should == expected_source
+          end
 
-                after do
-                  display_description
+          it "adds record `it 'is an example', :pending { }` -> `it 'is an example', :skip { }`" do
+            record.original_syntax.should  == "it 'is an example', :pending { }"
+            record.converted_syntax.should == "it 'is an example', :skip { }"
+          end
+        end
+
+        context "when it is `it 'description', :pending => true { }` form" do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'will be skipped', :pending => true do
+                  do_something
                 end
               end
             END
@@ -234,29 +245,52 @@ module Transpec
 
           let(:expected_source) do
             <<-END
-              module Helper
-                def display_description
-                  puts RSpec.current_example.description
+              describe 'example' do
+                it 'will be skipped', :skip => true do
+                  do_something
                 end
               end
+            END
+          end
+
+          it "converts into `it 'description', :skip => true { }` form" do
+            rewritten_source.should == expected_source
+          end
+
+          it "adds record `it 'is an example', :pending => value { }` -> `it 'is an example', :skip => value { }`" do
+            record.original_syntax.should  == "it 'is an example', :pending => value { }"
+            record.converted_syntax.should == "it 'is an example', :skip => value { }"
+          end
+        end
 
+        context "when it is `it 'description', pending: true { }` form" do
+          let(:source) do
+            <<-END
               describe 'example' do
-                include Helper
+                it 'will be skipped', pending: true do
+                  do_something
+                end
+              end
+            END
+          end
 
-                after do
-                  display_description
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'will be skipped', skip: true do
+                  do_something
                 end
               end
             END
           end
 
-          it 'converts into `def helper_method RSpec.current_example; end` form' do
+          it "converts into `it 'description', skip: true { }` form" do
             rewritten_source.should == expected_source
           end
 
-          it 'adds record `def helper_method example; end` -> `def helper_method RSpec.current_example; end`' do
-            record.original_syntax.should  == 'def helper_method example; end'
-            record.converted_syntax.should == 'def helper_method RSpec.current_example; end'
+          it "adds record `it 'is an example', :pending => value { }` -> `it 'is an example', :skip => value { }`" do
+            record.original_syntax.should  == "it 'is an example', :pending => value { }"
+            record.converted_syntax.should == "it 'is an example', :skip => value { }"
           end
         end
       end