transpec 1.10.4 → 1.11.0

data/lib/transpec/syntax/rspec_configure.rb

@@ -1,21 +1,31 @@
 # coding: utf-8
 
 require 'transpec/syntax'
+require 'transpec/syntax/mixin/send'
 require 'transpec/util'
 
 module Transpec
   class Syntax
     class RSpecConfigure < Syntax
+      require 'transpec/syntax/rspec_configure/configuration_modification'
       require 'transpec/syntax/rspec_configure/expectations'
       require 'transpec/syntax/rspec_configure/mocks'
 
-      include Util
+      include Mixin::Send, ConfigurationModification
+
+      define_dynamic_analysis do |rewriter|
+        code = "TranspecAnalysis.global_data[:rspec_configure_run_order] ||= 0\n" \
+               "TranspecAnalysis.global_data[:rspec_configure_run_order] += 1"
+        rewriter.register_request(node, :run_order, code)
+      end
 
       def dynamic_analysis_target?
-        return false unless node && node.block_type?
-        send_node = node.children.first
-        receiver_node, method_name, *_ = *send_node
-        const_name(receiver_node) == 'RSpec' && method_name == :configure
+        return false unless super
+        const_name(receiver_node) == 'RSpec' && method_name == :configure && parent_node.block_type?
+      end
+
+      def expose_dsl_globally=(boolean)
+        set_configuration!(:expose_dsl_globally, boolean)
       end
 
       def expectations
@@ -26,8 +36,10 @@ module Transpec
         @mocks ||= Mocks.new(self, source_rewriter)
       end
 
+      alias_method :block_node, :parent_node
+
       def block_arg_name
-        first_block_arg_name(node)
+        first_block_arg_name(block_node)
       end
     end
   end

data/lib/transpec/syntax/should.rb

@@ -21,20 +21,20 @@ module Transpec
         )
       end
 
-      def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
+      def initialize(*)
         super
         @current_syntax_type = :should
       end
 
       def dynamic_analysis_target?
-        super && !receiver_node.nil? && [:should, :should_not].include?(method_name)
+        super && receiver_node && [:should, :should_not].include?(method_name)
       end
 
       def expect_available?
         syntax_available?(__method__)
       end
 
-      def expectize!(negative_form = 'not_to', parenthesize_matcher_arg = true)
+      def expectize!(negative_form = 'not_to')
         fail ContextError.new("##{method_name}", '#expect', selector_range) unless expect_available?
 
         if proc_literal?(subject_node)
@@ -47,8 +47,6 @@ module Transpec
 
         @current_syntax_type = :expect
         register_record(negative_form)
-
-        operator_matcher.convert_operator!(parenthesize_matcher_arg) if operator_matcher
       end
 
       private

data/lib/transpec/syntax/should_receive.rb

@@ -29,7 +29,7 @@ module Transpec
 
       def dynamic_analysis_target?
         super &&
-          !receiver_node.nil? &&
+          receiver_node &&
           [:should_receive, :should_not_receive].include?(method_name)
       end
 

data/lib/transpec/syntax.rb

@@ -113,6 +113,10 @@ module Transpec
       dynamic_analysis_target?
     end
 
+    def dependent_syntaxes
+      @dependent_syntaxes ||= []
+    end
+
     def static_context_inspector
       @static_context_inspector ||= StaticContextInspector.new(node)
     end
@@ -124,5 +128,9 @@ module Transpec
     def expression_range
       node.loc.expression
     end
+
+    def inspect
+      "#<#{self.class}: #{node.type}>"
+    end
   end
 end

data/lib/transpec/util.rb

@@ -12,14 +12,6 @@ module Transpec
 
     module_function
 
-    def node_id(node)
-      source_range = node.loc.expression
-      source_buffer = source_range.source_buffer
-      absolute_path = File.expand_path(source_buffer.name)
-      relative_path = Pathname.new(absolute_path).relative_path_from(Pathname.pwd).to_s
-      [relative_path, source_range.begin_pos, source_range.end_pos].join('_')
-    end
-
     def proc_literal?(node)
       return false unless node.block_type?
 

data/lib/transpec/version.rb

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

data/spec/acceptance/configuration_modification_spec.rb

@@ -0,0 +1,132 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/cli'
+
+module Transpec
+  describe 'RSpec.configure modification' do
+    include FileHelper
+    include_context 'isolated environment'
+
+    let(:cli) do
+      DynamicAnalyzer.any_instance.stub(:silent?).and_return(true)
+      cli = CLI.new
+      cli.stub(:puts)
+      cli
+    end
+
+    context 'when there are multiple RSpec.configure in the spec suite' do
+      before do
+        create_file('spec/spec_helper.rb', <<-END)
+          RSpec.configure do |config|
+          end
+        END
+
+        create_file('spec/unit/spec_helper.rb', <<-END)
+          require 'spec_helper'
+
+          RSpec.configure do |config|
+          end
+        END
+
+        create_file('spec/unit/unit_spec.rb', <<-END)
+          require 'unit/spec_helper'
+
+          describe 'example' do
+            it 'responds to #message' do
+              Object.any_instance.stub(:message) do |arg|
+              end
+            end
+          end
+        END
+      end
+
+      it 'modifies only the one that was run first' do
+        cli.project.stub(:rspec_version).and_return(RSpecVersion.new('2.99.0'))
+        cli.run([])
+
+        File.read('spec/spec_helper.rb').should == <<-END
+          RSpec.configure do |config|
+            config.mock_with :rspec do |mocks|
+              mocks.yield_receiver_to_any_instance_implementation_blocks = true
+            end
+          end
+        END
+
+        File.read('spec/unit/spec_helper.rb').should == <<-END
+          require 'spec_helper'
+
+          RSpec.configure do |config|
+          end
+        END
+      end
+    end
+
+    describe 'yield_receiver_to_any_instance_implementation_blocks' do
+      let(:spec_helper_path) { 'spec/spec_helper.rb' }
+
+      before do
+        create_file(spec_helper_path, <<-END)
+          RSpec.configure do |config|
+          end
+        END
+      end
+
+      [
+        'Object.any_instance.stub(:message)',
+        'Object.any_instance.should_receive(:message)',
+        'allow_any_instance_of(Object).to receive(:message)',
+        'expect_any_instance_of(Object).to receive(:message)'
+      ].each do |syntax|
+        context "when there's a #{syntax} block to convert" do
+          before do
+            create_file('spec/example_spec.rb', <<-END)
+              describe 'example' do
+                it 'responds to #message' do
+                  #{syntax} do |arg|
+                  end
+                end
+              end
+            END
+          end
+
+          it 'adds yield_receiver_to_any_instance_implementation_blocks to the RSpec.configure' do
+            cli.project.stub(:rspec_version).and_return(RSpecVersion.new('2.99.0'))
+            cli.run([])
+
+            File.read(spec_helper_path).should == <<-END
+          RSpec.configure do |config|
+            config.mock_with :rspec do |mocks|
+              mocks.yield_receiver_to_any_instance_implementation_blocks = true
+            end
+          end
+            END
+          end
+        end
+      end
+
+      context "when there's no any_instance blocks to convert" do
+        before do
+          create_file('spec/example_spec.rb', <<-END)
+            describe 'example' do
+              it 'responds to #foo' do
+                Object.any_instance.stub(:foo) do
+                end
+              end
+            end
+          END
+        end
+
+        it 'does not modify RSpec.configure' do
+          cli.project.stub(:rspec_version).and_return(RSpecVersion.new('2.99.0'))
+          cli.run([])
+
+          File.read(spec_helper_path).should == <<-END
+          RSpec.configure do |config|
+          end
+          END
+        end
+      end
+    end
+  end
+end

data/spec/acceptance/conversion_spec.rb

@@ -0,0 +1,114 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/cli'
+
+module Transpec
+  describe 'conversion' do
+    include FileHelper
+    include_context 'isolated environment'
+
+    let(:cli) do
+      DynamicAnalyzer.any_instance.stub(:silent?).and_return(true)
+      cli = CLI.new
+      cli.stub(:puts)
+      cli
+    end
+
+    let(:spec_path) { 'spec/example_spec.rb' }
+
+    let(:converted_source) do
+      create_file(spec_path, source)
+      cli.run([])
+      File.read(spec_path)
+    end
+
+    describe 'one-liner expectation with have(n).items matcher' do
+      let(:source) do
+        <<-END
+          class Team
+            def players
+              [:foo, :bar, :baz]
+            end
+          end
+
+          describe 'example' do
+            describe 'collection' do
+              subject { [:foo, :bar, :baz] }
+
+              it { should have(3).items }
+            end
+
+            describe 'owner of collection' do
+              subject { Team.new }
+
+              it { should have_at_least(3).players }
+            end
+          end
+        END
+      end
+
+      let(:expected_source) do
+        <<-END
+          class Team
+            def players
+              [:foo, :bar, :baz]
+            end
+          end
+
+          describe 'example' do
+            describe 'collection' do
+              subject { [:foo, :bar, :baz] }
+
+              it 'has 3 items' do
+                expect(subject.size).to eq(3)
+              end
+            end
+
+            describe 'owner of collection' do
+              subject { Team.new }
+
+              it 'has at least 3 players' do
+                expect(subject.players.size).to be >= 3
+              end
+            end
+          end
+        END
+      end
+
+      it 'is converted properly' do
+        converted_source.should == expected_source
+      end
+    end
+
+    describe 'one-liner expectation with operator matcher' do
+      context 'in RSpec 2.99.0.beta2 or later' do
+        before do
+          cli.project.stub(:rspec_version).and_return(RSpecVersion.new('2.99.0.beta2'))
+        end
+
+        let(:source) do
+          <<-END
+            describe 'example' do
+              subject { 1 }
+              it { should == 1 }
+            end
+          END
+        end
+
+        let(:expected_source) do
+          <<-END
+            describe 'example' do
+              subject { 1 }
+              it { is_expected.to eq(1) }
+            end
+          END
+        end
+
+        it 'is converted properly' do
+          converted_source.should == expected_source
+        end
+      end
+    end
+  end
+end

data/spec/support/shared_context.rb

@@ -2,26 +2,20 @@
 
 # This context requires `source` to be defined with #let.
 shared_context 'parsed objects' do
-  let(:source_path) { '(string)' }
+  let(:source_path) { nil }
 
-  let(:source_buffer) do
-    require 'parser'
-    buffer = Parser::Source::Buffer.new(source_path)
-    buffer.source = source
-    buffer
+  let(:processed_source) do
+    require 'transpec/processed_source'
+    Transpec::ProcessedSource.parse(source, source_path)
   end
 
   let(:ast) do
-    require 'transpec/ast/builder'
-    require 'transpec/parser'
-    builder = Transpec::AST::Builder.new
-    parser = Parser::CurrentRuby.new(builder)
-    parser.parse(source_buffer)
+    processed_source.ast
   end
 
   let(:source_rewriter) do
     require 'parser'
-    Parser::Source::Rewriter.new(source_buffer)
+    Parser::Source::Rewriter.new(processed_source.buffer)
   end
 
   let(:rewritten_source) { source_rewriter.process }

data/spec/transpec/cli_spec.rb

@@ -47,7 +47,7 @@ module Transpec
 
       shared_examples 'rewrites files' do
         it 'rewrites files' do
-          cli.should_receive(:convert_file)
+          cli.should_receive(:convert_spec)
           cli.run(args)
         end
 
@@ -58,7 +58,7 @@ module Transpec
 
       shared_examples 'aborts processing' do
         it 'aborts processing' do
-          cli.should_not_receive(:convert_file)
+          cli.should_not_receive(:convert_spec)
           cli.run(args).should be_false
         end
       end
@@ -154,26 +154,21 @@ module Transpec
           DynamicAnalyzer.any_instance.stub(:analyze).and_raise(DynamicAnalyzer::AnalysisError)
         end
 
-        it 'suggests using -c/--rspec-command option' do
-          cli.stub(:exit)
+        include_examples 'aborts processing'
 
+        it 'suggests using -c/--rspec-command option' do
           cli.should_receive(:warn) do |message|
-            message.should include('-c/--rspec-command')
+            message.should include('use -c/--rspec-command')
           end
 
           cli.run(args)
         end
-
-        it 'exits with status 1' do
-          cli.should_receive(:exit).with(1)
-          cli.run(args)
-        end
       end
 
       context 'when a syntax error is raised while processing files' do
         let(:args) { [invalid_syntax_file_path, valid_syntax_file_path] }
-        let(:invalid_syntax_file_path) { 'invalid_example.rb' }
-        let(:valid_syntax_file_path) { 'valid_example.rb' }
+        let(:invalid_syntax_file_path) { 'spec/invalid_example.rb' }
+        let(:valid_syntax_file_path) { 'spec/valid_example.rb' }
 
         before do
           create_file(invalid_syntax_file_path, 'This is invalid syntax <')
@@ -181,10 +176,8 @@ module Transpec
         end
 
         it 'warns to the user' do
-          cli.should_receive(:warn) do |message|
-            message.should include('Syntax error')
-          end
-
+          cli.should_receive(:warn)
+            .with('Syntax error at spec/invalid_example.rb:2:1. Skipping the file.')
           cli.run(args)
         end
 
@@ -208,7 +201,7 @@ module Transpec
 
         it 'skips dynamic analysis' do
           DynamicAnalyzer.any_instance.should_not_receive(:analyze)
-          cli.should_receive(:convert_file)
+          cli.should_receive(:convert_spec)
           cli.run(args)
         end
       end
@@ -228,13 +221,18 @@ module Transpec
       end
     end
 
-    describe '#convert_file' do
+    describe '#convert_spec' do
       include_context 'isolated environment'
 
-      let(:file_path) { 'example.rb' }
+      let(:processed_source) do
+        path = 'example.rb'
+        create_file(path, source)
+        ProcessedSource.parse_file(path)
+      end
+
+      let(:spec_suite) { SpecSuite.new }
 
       before do
-        create_file(file_path, source)
         cli.stub(:puts)
       end
 
@@ -261,7 +259,7 @@ module Transpec
             message.should =~ /context/i
           end
 
-          cli.convert_file(file_path)
+          cli.convert_spec(processed_source, spec_suite)
         end
       end
 
@@ -281,7 +279,7 @@ module Transpec
             message.should =~ /converted.+but.+incorrect/i
           end
 
-          cli.convert_file(file_path)
+          cli.convert_spec(processed_source, spec_suite)
         end
       end
 
@@ -323,7 +321,7 @@ module Transpec
             times += 1
           end
 
-          cli.convert_file(file_path)
+          cli.convert_spec(processed_source, spec_suite)
         end
       end
     end

data/spec/transpec/configuration_spec.rb

@@ -19,7 +19,8 @@ module Transpec
         [:convert_deprecated_method?,                             true],
         [:parenthesize_matcher_arg?,                              true],
         [:add_receiver_arg_to_any_instance_implementation_block?, true],
-        [:convert_stub_with_hash_to_stub_and_return?,             false],
+        [:convert_stub_with_hash_to_allow_to_receive_and_return?, false],
+        [:convert_example_group?,                                 false],
         [:forced?,                                                false],
         [:skip_dynamic_analysis?,                                 false],
         [:negative_form_of_to,                                    'not_to'],