transpec 1.5.1 → 1.6.0

data/spec/transpec/rspec_version_spec.rb

@@ -35,7 +35,7 @@ module Transpec
       ]
     end
 
-    [:one_liner_is_expected_available?].each do |method|
+    [:oneliner_is_expected_available?].each do |method|
       include_examples 'feature availability', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
@@ -59,7 +59,7 @@ module Transpec
       ]
     end
 
-    [:receive_message_chain_available?].each do |method|
+    [:receive_message_chain_available?, :non_should_matcher_protocol_available?].each do |method|
       include_examples 'feature availability', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],

data/spec/transpec/static_context_inspector_spec.rb

@@ -45,54 +45,106 @@ module Transpec
             end
 
             1.times do
-              in_normal_block
-            end
+              in_block
+            end
+          end
+
+          feature 'Capybara DSL' do
+            background do
+              in_background
+            end
+
+            given(:foo) do
+              in_given
+            end
+
+            scenario 'some page shows something' do
+              in_scenario
+            end
+          end
+        END
+      end
+
+      [
+        [
+          'send nil :top_level',
+          'in top level',
+          []
+        ], [
+          'send nil :in_before',
+          'in before block in RSpec.configure',
+          [:rspec_configure, :each_before_after]
+        ], [
+          'module',
+          'at module definition in top level',
+          []
+        ], [
+          'const nil :SomeModule',
+          'at constant of module definition',
+          []
+        ], [
+          'send nil :in_module',
+          'in module',
+          [:module]
+        ], [
+          'send nil :describe',
+          'at #describe in module',
+          [:module]
+        ], [
+          'def :some_method',
+          'at method definition in #describe in module',
+          [:module, :example_group]
+        ], [
+          'arg :some_arg',
+          'at method argument in #describe in module',
+          [:module, :example_group, :def]
+        ], [
+          'send nil :do_something',
+          'in method in #describe in module',
+          [:module, :example_group, :def]
+        ], [
+          'send nil :it',
+          'at #it in #describe in module',
+          [:module, :example_group]
+        ], [
+          'str "is 1"',
+          "at #it's description in #describe in module",
+          [:module, :example_group]
+        ], [
+          'send nil :in_example',
+          '#it in #describe in module',
+          [:module, :example_group, :example]
+        ], [
+          'send nil :in_block',
+          'in normal block in #describe in module',
+          [:module]
+        ], [
+          'send nil :in_background',
+          'in #background block in #feature',
+          [:example_group, :each_before_after]
+        ], [
+          'send nil :in_given',
+          'in #given block in #feature',
+          [:example_group, :helper]
+        ], [
+          'send nil :in_scenario',
+          'in #scenario block in #feature',
+          [:example_group, :example]
+        ]
+      ].each  do |target_node_id, description, expected_scopes|
+        context "when #{description}" do
+          let(:target_node) do
+            ast.each_node.find do |node|
+              node_id(node) == target_node_id
+            end
+          end
+
+          it "returns #{expected_scopes.inspect}" do
+            fail 'Target node is not found!' unless target_node
+
+            context_inspector = StaticContextInspector.new(target_node)
+            context_inspector.scopes.should == expected_scopes
           end
-        END
-      end
-
-      it 'returns scope stack' do
-        ast.each_node do |node|
-          expected_scopes = begin
-            case node_id(node)
-            when 'send nil :top_level'
-              []
-            when 'send nil :in_before'
-              [:rspec_configure, :each_before_after]
-            when 'module'
-              []
-            when 'const nil :SomeModule'
-              # [:module] # TODO
-            when 'send nil :in_module'
-              [:module]
-            when 'send nil :describe'
-              # [:module] # TODO
-            when 'def :some_method'
-              [:module, :example_group]
-            when 'arg :some_arg'
-              # [:module, :example_group] # TODO
-            when 'send nil :do_something'
-              [:module, :example_group, :def]
-            when 'send nil :it'
-              # [:module, :example_group] # TODO
-            when 'str "is 1"'
-              # [:module, :example_group] # TODO
-            when 'send nil :in_example'
-              [:module, :example_group, :example]
-            when 'send nil :in_normal_block'
-              [:module]
-            end
-          end
-
-          # TODO: Some scope nodes have special child nodes
-          #   such as their arguments or their subject.
-          #   But from scope point of view, the child nodes are not in the parent's scope,
-          #   they should be in the next outer scope.
-
-          next unless expected_scopes
-
-          context_inspector = StaticContextInspector.new(node)
-          context_inspector.scopes.should == expected_scopes
         end
       end
     end

data/spec/transpec/syntax/matcher_definition_spec.rb

@@ -0,0 +1,59 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/syntax/matcher_definition'
+
+module Transpec
+  class Syntax
+    describe MatcherDefinition do
+      include_context 'parsed objects'
+      include_context 'syntax object', MatcherDefinition, :matcher_definition
+
+      let(:record) { matcher_definition.report.records.last }
+
+      describe '#convert_deprecated_method!' do
+        before do
+          matcher_definition.convert_deprecated_method!
+        end
+
+        [
+          [:match_for_should,               :match],
+          [:match_for_should_not,           :match_when_negated],
+          [:failure_message_for_should,     :failure_message],
+          [:failure_message_for_should_not, :failure_message_when_negated]
+        ].each do |target_method, converted_method|
+          context "when it is `#{target_method} { }` form" do
+            let(:source) do
+              <<-END
+                RSpec::Matchers.define :be_awesome do |expected|
+                  #{target_method} do |actual|
+                    true
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                RSpec::Matchers.define :be_awesome do |expected|
+                  #{converted_method} do |actual|
+                    true
+                  end
+                end
+              END
+            end
+
+            it "converts into `#{converted_method} { }` form" do
+              rewritten_source.should == expected_source
+            end
+
+            it "adds record `#{target_method} { }` -> `#{converted_method} { }`" do
+              record.original_syntax.should  == "#{target_method} { }"
+              record.converted_syntax.should == "#{converted_method} { }"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/tasks/readme.rake

@@ -2,10 +2,27 @@
 
 desc 'Generate README.md'
 task :readme do
+  File.write('README.md', generate_readme)
+end
+
+namespace :readme do
+  task :check do
+    unless File.read('README.md') == generate_readme
+      fail <<-END.gsub(/^\s+\|/, '').chomp
+        |README.md and README.md.erb are out of sync!
+        |If you need to modify the content of README.md:
+        |  * Edit README.md.erb.
+        |  * Run `bundle exec rake readme`.
+        |  * Commit both files.
+      END
+    end
+  end
+end
+
+def generate_readme
   require 'erb'
   require 'transpec/cli'
 
   erb = ERB.new(File.read('README.md.erb'), nil, '-')
-  content = erb.result(binding)
-  File.write('README.md', content)
+  erb.result(binding)
 end

data/transpec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'parser',        '~> 2.0'
+  spec.add_runtime_dependency 'parser',        '~> 2.1'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
   spec.add_runtime_dependency 'rainbow',       '~> 1.1'
   spec.add_runtime_dependency 'json',          '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/transpec/syntax/expect.rb
 - lib/transpec/syntax/have.rb
 - lib/transpec/syntax/its.rb
+- lib/transpec/syntax/matcher_definition.rb
 - lib/transpec/syntax/method_stub.rb
 - lib/transpec/syntax/mixin/allow_no_message.rb
 - lib/transpec/syntax/mixin/any_instance.rb
@@ -285,6 +286,7 @@ files:
 - spec/transpec/syntax/expect_spec.rb
 - spec/transpec/syntax/have_spec.rb
 - spec/transpec/syntax/its_spec.rb
+- spec/transpec/syntax/matcher_definition_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
 - spec/transpec/syntax/oneliner_should_spec.rb
 - spec/transpec/syntax/operator_matcher_spec.rb
@@ -353,6 +355,7 @@ test_files:
 - spec/transpec/syntax/expect_spec.rb
 - spec/transpec/syntax/have_spec.rb
 - spec/transpec/syntax/its_spec.rb
+- spec/transpec/syntax/matcher_definition_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
 - spec/transpec/syntax/oneliner_should_spec.rb
 - spec/transpec/syntax/operator_matcher_spec.rb