transpec 1.13.1 → 2.0.0

data/spec/transpec/option_parser_spec.rb

@@ -5,8 +5,8 @@ require 'transpec/option_parser'
 
 module Transpec
   describe OptionParser do
-    subject(:parser) { OptionParser.new(configuration) }
-    let(:configuration) { Configuration.new }
+    subject(:parser) { OptionParser.new(config) }
+    let(:config) { Config.new }
 
     describe '#parse' do
       subject { parser.parse(args) }
@@ -24,38 +24,18 @@ module Transpec
       describe '-f/--force option' do
         let(:args) { ['--force'] }
 
-        it 'sets Configuration#forced? true' do
+        it 'sets Config#forced? true' do
           parser.parse(args)
-          configuration.forced?.should be_true
+          config.forced?.should be_true
         end
       end
 
       describe '-s/--skip-dynamic-analysis option' do
         let(:args) { ['--skip-dynamic-analysis'] }
 
-        it 'sets Configuration#skip_dynamic_analysis? true' do
+        it 'sets Config#skip_dynamic_analysis? true' do
           parser.parse(args)
-          configuration.skip_dynamic_analysis?.should be_true
-        end
-      end
-
-      describe '-m/--generate-commit-message option' do
-        let(:args) { ['--generate-commit-message'] }
-
-        before do
-          parser.stub(:warn)
-        end
-
-        it 'is deprecated' do
-          parser.should_receive(:warn) do |message|
-            message.should =~ /--generate-commit-message.+deprecated/i
-          end
-
-          parser.parse(args)
-        end
-
-        it 'does not raise error' do
-          -> { parser.parse(args) }.should_not raise_error
+          config.skip_dynamic_analysis?.should be_true
         end
       end
 
@@ -73,9 +53,9 @@ module Transpec
           context "when #{cli_type.inspect} is specified" do
             let(:args) { ['--keep', cli_type] }
 
-            it "sets Configuration##{config_attr} false" do
+            it "sets Config##{config_attr} false" do
               parser.parse(args)
-              configuration.send(config_attr).should be_false
+              config.send(config_attr).should be_false
             end
           end
         end
@@ -85,8 +65,8 @@ module Transpec
 
           it 'handles all of them' do
             parser.parse(args)
-            configuration.convert_should_receive?.should be_false
-            configuration.convert_deprecated_method?.should be_false
+            config.convert_should_receive?.should be_false
+            config.convert_deprecated_method?.should be_false
           end
         end
 
@@ -110,9 +90,9 @@ module Transpec
           context "when #{cli_type.inspect} is specified" do
             let(:args) { ['--convert', cli_type] }
 
-            it "sets Configuration##{config_attr} true" do
+            it "sets Config##{config_attr} true" do
               parser.parse(args)
-              configuration.send(config_attr).should be_true
+              config.send(config_attr).should be_true
             end
           end
         end
@@ -133,9 +113,9 @@ module Transpec
           context "when #{form.inspect} is specified" do
             let(:args) { ['--negative-form', form] }
 
-            it "sets Configuration#negative_form_of_to #{form.inspect}" do
+            it "sets Config#negative_form_of_to #{form.inspect}" do
               parser.parse(args)
-              configuration.negative_form_of_to.should == form
+              config.negative_form_of_to.should == form
             end
           end
         end
@@ -146,18 +126,18 @@ module Transpec
           ['truthy,falsey', :conditional, 'be_falsey'],
           ['truthy,falsy',  :conditional, 'be_falsy'],
           ['true,false',    :exact,       'be_falsey']
-        ].each do |cli_type, configuration_type, form_of_be_falsey|
+        ].each do |cli_type, config_type, form_of_be_falsey|
           context "when #{cli_type.inspect} is specified" do
             let(:args) { ['--boolean-matcher', cli_type] }
 
-            it "sets Configuration#boolean_matcher_type #{configuration_type.inspect}" do
+            it "sets Config#boolean_matcher_type #{config_type.inspect}" do
               parser.parse(args)
-              configuration.boolean_matcher_type.should == configuration_type
+              config.boolean_matcher_type.should == config_type
             end
 
-            it "sets Configuration#form_of_be_falsey #{form_of_be_falsey.inspect}" do
+            it "sets Config#form_of_be_falsey #{form_of_be_falsey.inspect}" do
               parser.parse(args)
-              configuration.form_of_be_falsey.should == form_of_be_falsey
+              config.form_of_be_falsey.should == form_of_be_falsey
             end
           end
         end
@@ -176,40 +156,28 @@ module Transpec
       describe '-a/--no-yield-any-instance option' do
         let(:args) { ['--no-yield-any-instance'] }
 
-        it 'sets Configuration#add_receiver_arg_to_any_instance_implementation_block? false' do
+        it 'sets Config#add_receiver_arg_to_any_instance_implementation_block? false' do
           parser.parse(args)
-          configuration.add_receiver_arg_to_any_instance_implementation_block?
+          config.add_receiver_arg_to_any_instance_implementation_block?
             .should be_false
         end
       end
 
-      describe '-t/--convert-stub-with-hash option' do
-        let(:args) { ['--convert-stub-with-hash'] }
-
-        before do
-          parser.stub(:warn)
-        end
-
-        it 'sets Configuration#convert_stub_with_hash_to_allow_to_receive_and_return? true' do
-          parser.parse(args)
-          configuration.convert_stub_with_hash_to_allow_to_receive_and_return?.should be_true
-        end
-
-        it 'is deprecated' do
-          parser.should_receive(:warn) do |message|
-            message.should =~ /--convert-stub-with-hash.+deprecated/i
-          end
+      describe '-t/--no-explicit-spec-type option' do
+        let(:args) { ['--no-explicit-spec-type'] }
 
+        it 'sets Config#add_explicit_type_metadata_to_example_group? false' do
           parser.parse(args)
+          config.add_explicit_type_metadata_to_example_group?.should be_false
         end
       end
 
       describe '-p/--no-parentheses-matcher-arg option' do
         let(:args) { ['--no-parentheses-matcher-arg'] }
 
-        it 'sets Configuration#parenthesize_matcher_arg? false' do
+        it 'sets Config#parenthesize_matcher_arg? false' do
           parser.parse(args)
-          configuration.parenthesize_matcher_arg.should be_false
+          config.parenthesize_matcher_arg.should be_false
         end
       end
 

data/spec/transpec/rspec_version_spec.rb

@@ -32,9 +32,11 @@ module Transpec
         ['2.14.0',       false],
         ['2.99.0.beta1', true],
         ['2.99.0.beta2', true],
+        ['2.99.0.rc1',   true],
         ['2.99.0',       true],
         ['3.0.0.beta1',  true],
         ['3.0.0.beta2',  true],
+        ['3.0.0.rc1',    true],
         ['3.0.0',        true]
       ]
     end
@@ -47,9 +49,27 @@ module Transpec
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', true],
+        ['2.99.0.rc1',   true],
         ['2.99.0',       true],
         ['3.0.0.beta1',  false],
         ['3.0.0.beta2',  true],
+        ['3.0.0.rc1',    true],
+        ['3.0.0',        true]
+      ]
+    end
+
+    [
+      :implicit_spec_type_disablement_available?
+    ].each do |method|
+      include_examples 'version comparisons', method, [
+        ['2.14.0',       false],
+        ['2.99.0.beta1', false],
+        ['2.99.0.beta2', false],
+        ['2.99.0.rc1',   true],
+        ['2.99.0',       true],
+        ['3.0.0.beta1',  false],
+        ['3.0.0.beta2',  false],
+        ['3.0.0.rc1',    true],
         ['3.0.0',        true]
       ]
     end
@@ -61,9 +81,11 @@ module Transpec
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', false],
+        ['2.99.0.rc1',   false],
         ['2.99.0',       false],
         ['3.0.0.beta1',  true],
         ['3.0.0.beta2',  true],
+        ['3.0.0.rc1',    true],
         ['3.0.0',        true]
       ]
     end
@@ -78,9 +100,11 @@ module Transpec
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', false],
+        ['2.99.0.rc1',   false],
         ['2.99.0',       false],
         ['3.0.0.beta1',  false],
         ['3.0.0.beta2',  true],
+        ['3.0.0.rc1',    true],
         ['3.0.0',        true]
       ]
     end
@@ -89,9 +113,11 @@ module Transpec
       ['2.14.0',       false],
       ['2.99.0.beta1', true],
       ['2.99.0.beta2', true],
+      ['2.99.0.rc1',   true],
       ['2.99.0',       true],
       ['3.0.0.beta1',  false],
       ['3.0.0.beta2',  false],
+      ['3.0.0.rc1',    false],
       ['3.0.0',        false]
     ]
   end

data/spec/transpec/syntax/example_group_spec.rb

@@ -49,6 +49,20 @@ module Transpec
           end
         end
 
+        context "with expression `RSpec.describe 'something' do ... end`" do
+          let(:source) do
+            <<-END
+              RSpec.describe 'something' do
+              end
+            END
+          end
+
+          it 'does nothing' do
+            example_group.convert_to_non_monkey_patch!
+            rewritten_source.should == source
+          end
+        end
+
         context 'when the #describe is in a module' do
           let(:source) do
             <<-END
@@ -167,6 +181,269 @@ module Transpec
           end
         end
       end
+
+      describe '#add_explicit_type_metadata!' do
+        before do
+          example_group.add_explicit_type_metadata!
+        end
+
+        context 'when it is in top level scope' do
+          context "and expression `describe 'something' do ... end`" do
+            let(:source) do
+              <<-END
+                    describe 'something' do
+                    end
+              END
+            end
+
+            {
+              'controllers' => :controller,
+              'helpers'     => :helper,
+              'mailers'     => :mailer,
+              'models'      => :model,
+              'requests'    => :request,
+              'integration' => :request,
+              'api'         => :request,
+              'routing'     => :routing,
+              'views'       => :view,
+              'features'    => :feature
+            }.each do |directory, type|
+              context "and the file path is \"spec/#{directory}/some_spec.rb\"" do
+                let(:source_path) { "spec/#{directory}/some_spec.rb" }
+
+                let(:expected_source) do
+                  <<-END
+                    describe 'something', :type => #{type.inspect} do
+                    end
+                  END
+                end
+
+                it "adds metadata \":type => #{type.inspect}\"" do
+                  rewritten_source.should == expected_source
+                end
+
+                it "adds record `describe 'some #{type}' { }` " \
+                   "-> `describe 'some #{type}', :type => #{type.inspect} { }`" do
+                  record.original_syntax.should  == "describe 'some #{type}' { }"
+                  record.converted_syntax.should  == "describe 'some #{type}', :type => #{type.inspect} { }"
+                end
+              end
+            end
+
+            context 'and the file path is "spec/contollers/some_namespace/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_namespace/some_spec.rb' }
+
+              let(:expected_source) do
+                <<-END
+                    describe 'something', :type => :controller do
+                    end
+                END
+              end
+
+              it 'adds metadata ":type => :controller' do
+                rewritten_source.should == expected_source
+              end
+            end
+
+            context 'and the file path is "spec/unit/some_spec.rb"' do
+              let(:source_path) { 'spec/unit/some_spec.rb' }
+
+              it 'does nothing' do
+                rewritten_source.should == source
+              end
+            end
+
+            context 'and the file path is "features/controllers/some_spec.rb"' do
+              let(:source_path) { 'features/controllers/some_spec.rb' }
+
+              it 'does nothing' do
+                rewritten_source.should == source
+              end
+            end
+          end
+
+          context "and expression `describe 'something', :foo => :bar do ... end`" do
+            let(:source) do
+              <<-END
+                  describe 'something', :foo => :bar do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              let(:expected_source) do
+                <<-END
+                  describe 'something', :type => :controller, :foo => :bar do
+                  end
+                END
+              end
+
+              it 'adds metadata ":type => :controller"' do
+                rewritten_source.should == expected_source
+              end
+            end
+          end
+
+          context "and expression `describe 'something', foo: :bar do ... end`" do
+            let(:source) do
+              <<-END
+                  describe 'something', foo: :bar do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              let(:expected_source) do
+                <<-END
+                  describe 'something', type: :controller, foo: :bar do
+                  end
+                END
+              end
+
+              it 'adds metadata "type: :controller"' do
+                rewritten_source.should == expected_source
+              end
+            end
+          end
+
+          context "and expression `describe 'something', :type => :foo do ... end`" do
+            let(:source) do
+              <<-END
+                  describe 'something', :type => :foo do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              it 'does nothing' do
+                rewritten_source.should == source
+              end
+            end
+          end
+
+          context "and expression `RSpec.describe 'something' do ... end`" do
+            let(:source) do
+              <<-END
+                  RSpec.describe 'something' do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              let(:expected_source) do
+                <<-END
+                  RSpec.describe 'something', :type => :controller do
+                  end
+                END
+              end
+
+              it 'adds metadata ":type => :controller"' do
+                rewritten_source.should == expected_source
+              end
+            end
+          end
+
+          context "and expression `shared_examples 'something' do ... end`" do
+            let(:source) do
+              <<-END
+                  shared_examples 'something' do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              it 'does nothing' do
+                rewritten_source.should == source
+              end
+            end
+          end
+        end
+
+        context 'when #describes are nested' do
+          let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+          let(:source) do
+            <<-END
+              describe 'something' do
+                describe '#some_method' do
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'something', :type => :controller do
+                describe '#some_method' do
+                end
+              end
+            END
+          end
+
+          it 'adds the metadata only to the outmost #describe' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'with runtime information' do
+          include_context 'dynamic analysis objects'
+
+          let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+          context 'when rspec-rails is loaded in the spec' do
+            let(:source) do
+              <<-END
+                module RSpec
+                  module Rails
+                  end
+                end
+
+                describe 'something' do
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                module RSpec
+                  module Rails
+                  end
+                end
+
+                describe 'something', :type => :controller do
+                end
+              END
+            end
+
+            it 'adds the metadata' do
+              rewritten_source.should == expected_source
+            end
+          end
+
+          context 'when rspec-rails is not loaded in the spec' do
+            let(:source) do
+              <<-END
+                describe 'something' do
+                end
+              END
+            end
+
+            it 'does nothing' do
+              rewritten_source.should == source
+            end
+          end
+        end
+      end
     end
   end
 end