transpec 1.9.3 → 1.10.0

data/lib/transpec/version.rb

@@ -4,8 +4,8 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 9
-    PATCH = 3
+    MINOR = 10
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/support/file_helper.rb

@@ -9,7 +9,7 @@ module FileHelper
     file_path = File.expand_path(file_path)
 
     dir_path = File.dirname(file_path)
-    FileUtils.makedirs(dir_path) unless File.exists?(dir_path)
+    FileUtils.makedirs(dir_path) unless File.exist?(dir_path)
 
     File.open(file_path, 'w') do |file|
       case content

data/spec/support/shared_context.rb

@@ -2,9 +2,11 @@
 
 # This context requires `source` to be defined with #let.
 shared_context 'parsed objects' do
+  let(:source_path) { '(string)' }
+
   let(:source_buffer) do
     require 'parser'
-    buffer = Parser::Source::Buffer.new('(string)')
+    buffer = Parser::Source::Buffer.new(source_path)
     buffer.source = source
     buffer
   end
@@ -34,13 +36,6 @@ shared_context 'dynamic analysis objects' do
 
   let(:source_path) { 'spec/example_spec.rb' }
 
-  let(:source_buffer) do
-    require 'parser'
-    buffer = Parser::Source::Buffer.new(source_path)
-    buffer.source = source
-    buffer
-  end
-
   runtime_data_cache = {}
 
   let(:runtime_data) do

data/spec/transpec/cli_spec.rb

@@ -185,7 +185,7 @@ module Transpec
         let(:args) { ['--skip-dynamic-analysis', file_path] }
 
         it 'skips dynamic analysis' do
-          DynamicAnalyzer.any_instance.should_not_receive(:analysis)
+          DynamicAnalyzer.any_instance.should_not_receive(:analyze)
           cli.should_receive(:convert_file)
           cli.run(args)
         end
@@ -242,6 +242,68 @@ module Transpec
           cli.convert_file(file_path)
         end
       end
+
+      context 'when it did a less accurate conversion due to a lack of runtime information' do
+        let(:source) do
+          <<-END
+            describe 'example group' do
+              it 'is an example' do
+                expect(obj).to have(2).items
+              end
+            end
+          END
+        end
+
+        it 'warns to user' do
+          cli.should_receive(:warn) do |message|
+            message.should =~ /converted.+but.+incorrect/i
+          end
+
+          cli.convert_file(file_path)
+        end
+      end
+
+      context 'when both conversion errors and less accurate records are reported' do
+        let(:source) do
+          <<-END
+            describe 'example group' do
+              it 'is first' do
+                expect(obj).to have(1).item
+              end
+
+              class Klass
+                def second
+                  2.should == 2
+                end
+              end
+
+              it 'is an example' do
+                Klass.new.some_method
+              end
+
+              it 'is third' do
+                expect(obj).to have(3).items
+              end
+            end
+          END
+        end
+
+        it 'displays them in order of line number' do
+          times = 1
+
+          cli.should_receive(:warn).exactly(3).times do |message|
+            line_number = case times
+                          when 1 then 3
+                          when 2 then 8
+                          when 3 then 17
+                          end
+            message.should include(":#{line_number}:")
+            times += 1
+          end
+
+          cli.convert_file(file_path)
+        end
+      end
     end
   end
 end

data/spec/transpec/configuration_spec.rb

@@ -15,6 +15,7 @@ module Transpec
         [:convert_stub?,                                          true],
         [:convert_have_items?,                                    true],
         [:convert_its?,                                           true],
+        [:convert_pending?,                                       true],
         [:convert_deprecated_method?,                             true],
         [:parenthesize_matcher_arg?,                              true],
         [:add_receiver_arg_to_any_instance_implementation_block?, true],

data/spec/transpec/converter_spec.rb

@@ -117,6 +117,11 @@ module Transpec
         it 'does not convert the expectation to non-monkey-patch syntax' do
           should == source
         end
+
+        it 'adds the conversion error to the report' do
+          converter.convert(source)
+          converter.report.should have(1).conversion_error
+        end
       end
     end
 
@@ -913,15 +918,101 @@ module Transpec
     describe '#process_example' do
       let(:example_object) { double('example_object').as_null_object }
 
+      shared_examples 'does nothing' do
+        it 'does nothing' do
+          example_object.should_not_receive(:convert_pending_to_skip!)
+          converter.process_example(example_object)
+        end
+      end
+
+      context 'when RSpecVersion#rspec_2_99? returns true' do
+        before { rspec_version.stub(:rspec_2_99?).and_return(true) }
+
+        context 'and Configuration#convert_pending? returns true' do
+          before { configuration.convert_pending = true }
+
+          it 'invokes Example#convert_pending_to_skip!' do
+            example_object.should_receive(:convert_pending_to_skip!)
+            converter.process_example(example_object)
+          end
+        end
+
+        context 'and Configuration#convert_pending? returns false' do
+          before { configuration.convert_pending = false }
+          include_examples 'does nothing'
+        end
+      end
+
+      context 'when RSpecVersion#rspec_2_99? returns false' do
+        before { rspec_version.stub(:rspec_2_99?).and_return(false) }
+
+        context 'and Configuration#convert_pending? returns true' do
+          before { configuration.convert_pending = true }
+          include_examples 'does nothing'
+        end
+
+        context 'and Configuration#convert_pending? returns false' do
+          before { configuration.convert_pending = false }
+          include_examples 'does nothing'
+        end
+      end
+    end
+
+    describe '#process_pending' do
+      let(:pending_object) { double('pending_object').as_null_object }
+
+      shared_examples 'does nothing' do
+        it 'does nothing' do
+          pending_object.should_not_receive(:convert_deprecated_syntax!)
+          converter.process_pending(pending_object)
+        end
+      end
+
+      context 'when RSpecVersion#rspec_2_99? returns true' do
+        before { rspec_version.stub(:rspec_2_99?).and_return(true) }
+
+        context 'and Configuration#convert_pending? returns true' do
+          before { configuration.convert_pending = true }
+
+          it 'invokes Example#convert_deprecated_syntax!' do
+            pending_object.should_receive(:convert_deprecated_syntax!)
+            converter.process_pending(pending_object)
+          end
+        end
+
+        context 'and Configuration#convert_pending? returns false' do
+          before { configuration.convert_pending = false }
+          include_examples 'does nothing'
+        end
+      end
+
+      context 'when RSpecVersion#rspec_2_99? returns false' do
+        before { rspec_version.stub(:rspec_2_99?).and_return(false) }
+
+        context 'and Configuration#convert_pending? returns true' do
+          before { configuration.convert_pending = true }
+          include_examples 'does nothing'
+        end
+
+        context 'and Configuration#convert_pending? returns false' do
+          before { configuration.convert_pending = false }
+          include_examples 'does nothing'
+        end
+      end
+    end
+
+    describe '#process_current_example' do
+      let(:current_example_object) { double('current_example_object').as_null_object }
+
       context 'when RSpecVersion#yielded_example_available? returns true' do
         before { rspec_version.stub(:yielded_example_available?).and_return(true) }
 
         context 'and Configuration#convert_deprecated_method? is true' do
           before { configuration.convert_deprecated_method = true }
 
-          it 'invokes Example#convert!' do
-            example_object.should_receive(:convert!)
-            converter.process_example(example_object)
+          it 'invokes CurrentExample#convert!' do
+            current_example_object.should_receive(:convert!)
+            converter.process_current_example(current_example_object)
           end
         end
 
@@ -929,8 +1020,8 @@ module Transpec
           before { configuration.convert_deprecated_method = false }
 
           it 'does nothing' do
-            example_object.should_not_receive(:convert!)
-            converter.process_example(example_object)
+            current_example_object.should_not_receive(:convert!)
+            converter.process_current_example(current_example_object)
           end
         end
       end
@@ -942,8 +1033,8 @@ module Transpec
           before { configuration.convert_deprecated_method = true }
 
           it 'does nothing' do
-            example_object.should_not_receive(:convert!)
-            converter.process_example(example_object)
+            current_example_object.should_not_receive(:convert!)
+            converter.process_current_example(current_example_object)
           end
         end
       end
@@ -1041,9 +1132,9 @@ module Transpec
         end
       end
 
-      context 'when RSpecVersion#migration_term_of_any_instance_implementation_block? returns true' do
+      context 'when RSpecVersion#rspec_2_99? returns true' do
         before do
-          rspec_version.stub(:migration_term_of_any_instance_implementation_block?).and_return(true)
+          rspec_version.stub(:rspec_2_99?).and_return(true)
         end
 
         context 'and Configuration#convert_deprecated_method? returns true' do
@@ -1078,9 +1169,9 @@ module Transpec
         end
       end
 
-      context 'when RSpecVersion#migration_term_of_any_instance_implementation_block? returns false' do
+      context 'when RSpecVersion#rspec_2_99? returns false' do
         before do
-          rspec_version.stub(:migration_term_of_any_instance_implementation_block?).and_return(false)
+          rspec_version.stub(:rspec_2_99?).and_return(false)
         end
 
         it 'does not invoke RSpecConfigure.mocks.yield_receiver_to_any_instance_implementation_blocks=' do
@@ -1115,9 +1206,9 @@ module Transpec
     describe '#process_any_instance_block' do
       let(:messaging_host) { double('messaging host').as_null_object }
 
-      context 'when RSpecVersion#migration_term_of_any_instance_implementation_block? returns true' do
+      context 'when RSpecVersion#rspec_2_99? returns true' do
         before do
-          rspec_version.stub(:migration_term_of_any_instance_implementation_block?).and_return(true)
+          rspec_version.stub(:rspec_2_99?).and_return(true)
         end
 
         context 'and Configuration#convert_deprecated_method? returns true' do
@@ -1156,9 +1247,9 @@ module Transpec
         end
       end
 
-      context 'when RSpecVersion#migration_term_of_any_instance_implementation_block? returns false' do
+      context 'when RSpecVersion#rspec_2_99? returns false' do
         before do
-          rspec_version.stub(:migration_term_of_any_instance_implementation_block?).and_return(false)
+          rspec_version.stub(:rspec_2_99?).and_return(false)
         end
 
         it 'does nothing' do

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -15,18 +15,14 @@ module Transpec
 
         let(:source) do
           <<-END
-            it 'is foo' do
-              subject.should be(foo)
-            end
+            subject.should be(foo)
           END
         end
 
         # rubocop:disable LineLength
         let(:expected_source) do
           <<-END
-            it 'is foo' do
-              transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 41, 48).should be(foo)), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 41, 63)
-            end
+            transpec_analyze((transpec_analyze((subject), self, "(string)_12_19", { :should_source_location => [:object, "method(:should).source_location"] }).should be(foo)), self, "(string)_12_34", { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] })
           END
         end
         # rubocop:enable LineLength
@@ -38,22 +34,18 @@ module Transpec
         context 'when the target includes here document' do
           let(:source) do
             <<-END
-              it 'matches to foo' do
-                subject.should =~ <<-HEREDOC.gsub('foo', 'bar')
-                foo
-                HEREDOC
-              end
+              subject.should =~ <<-HEREDOC.gsub('foo', 'bar')
+              foo
+              HEREDOC
             END
           end
 
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              it 'matches to foo' do
-                transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 53, 60).should), self, { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 53, 67) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')), self, { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] }, __FILE__, 71, 100)
-                foo
-                HEREDOC
-              end
+              transpec_analyze((transpec_analyze((subject), self, "(string)_14_21", { :should_source_location => [:object, "method(:should).source_location"] }).should), self, "(string)_14_28", { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }) =~ transpec_analyze((<<-HEREDOC.gsub('foo', 'bar')), self, "(string)_32_61", { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] })
+              foo
+              HEREDOC
             END
           end
           # rubocop:enable LineLength
@@ -66,18 +58,14 @@ module Transpec
         context 'when the target takes block' do
           let(:source) do
             <<-END
-              it 'raises error' do
-                expect { do_something }.to throw_symbol
-              end
+              expect { do_something }.to throw_symbol
             END
           end
 
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              it 'raises error' do
-                transpec_analysis((expect { do_something }), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 57).to throw_symbol
-              end
+              transpec_analyze((expect { do_something }), self, "(string)_14_20", { :expect_source_location => [:context, "method(:expect).source_location"] }).to throw_symbol
             END
           end
           # rubocop:enable LineLength
@@ -87,45 +75,17 @@ module Transpec
           end
         end
 
-        context 'when the target is only the expression in a block' do
-          let(:source) do
-            <<-END
-              it 'raises error' do
-                expect
-              end
-            END
-          end
-
-          # rubocop:disable LineLength
-          let(:expected_source) do
-            <<-END
-              it 'raises error' do
-                transpec_analysis((expect), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 57)
-              end
-            END
-          end
-          # rubocop:enable LineLength
-
-          it 'wraps the target properly' do
-            should == expected_source
-          end
-        end
-
         context 'when the target is method invocation without parentheses' do
           let(:source) do
             <<-END
-              it 'raises error' do
-                expect subject
-              end
+              double 'something'
             END
           end
 
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              it 'raises error' do
-                transpec_analysis((expect subject), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 65)
-              end
+              transpec_analyze((double 'something'), self, "(string)_14_32", { :double_source_location => [:context, "method(:double).source_location"] })
             END
           end
           # rubocop:enable LineLength

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -164,7 +164,7 @@ module Transpec
         runtime_data.should be_an(DynamicAnalyzer::RuntimeData)
       end
 
-      describe 'its element' do
+      describe 'an element of the runtime data' do
         let(:ast) do
           source_buffer = Parser::Source::Buffer.new(file_path)
           source_buffer.source = source
@@ -188,7 +188,7 @@ module Transpec
         end
 
         it 'has result of requested analysis' do
-          element[:available_query_methods].result.should =~ %w(size count length)
+          element[:available_query_methods].should =~ %w(size count length)
         end
       end
     end