turnip 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb367c9acc76b2fb0f4abbbedf8730ce97f3d33
-  data.tar.gz: 69314b7771dfcd5a645b4a41b01d1c99c84ae5e6
+  metadata.gz: 55812553e9b4c345d85bd1d9d0561c1480306486
+  data.tar.gz: 3ffd467efff8bdc43ed27623b46370dd53c665e6
 SHA512:
-  metadata.gz: 0ba3f6f9153835411c293efb95224f4e3a0a22e6f896a2df4ab52739c9ae66a661658c10e214a7a06bb6bb625c16c8bb4105739c93d0abcf8b2d3b63ea190e8b
-  data.tar.gz: 2305ebaeee98b1da8a8f599fc3a94c51c27487732e9af2d5762f56260cebf186665a38e1123249860f6330f8ca7865276d974d00c116bf33455c6be2ac20ce8b
+  metadata.gz: 1d28c1998683657ea2c3b110e53edcb75adff78a47fc2210dcfae622c6cb60fcf54292b5d95ae6a5ce8c345cf2f5502d952a5e474a9c4957033f0a3d83ab653c
+  data.tar.gz: 8bed3537732a35c45796fc63f6a6725d397045f23bfb5b6b12af73c9650a4447c55404d5ebce6bb7c6f9a9ceaed716886c60af60988c1044138b20f8bbf4e671

data/.rspec

@@ -1 +1 @@
--r turnip
+-r turnip/rspec

data/.travis.yml

@@ -3,3 +3,7 @@ rvm:
  - 2.0.0
  - 2.1.0
  - jruby-19mode
+gemfile:
+- gemfiles/Gemfile-rspec-2.14.x
+- gemfiles/Gemfile-rspec-2.99.x
+- gemfiles/Gemfile-rspec-3.0.x

data/README.md

@@ -360,6 +360,18 @@ step "there are the following monsters:" do |table|
 end
 ```
 
+## Unimplemented steps
+Turnip mark a scenario as pending when steps in the scenario is not implemented.
+If you sets `raise_error_for_unimplemented_steps` as `true`, turnip will mark a scenario as fail.
+
+It defaults to `false`, you can change it by following configuration:
+
+```ruby
+RSpec.configure do |config|
+  config.raise_error_for_unimplemented_steps = true
+end
+```
+
 ## Substitution in Scenario Outlines
 
 You would be able to use substitution that can be used to DocString and Table arguments in Scenario Outline like [Cucumber](http://cukes.info/step-definitions.html#substitution_in_scenario_outlines):

data/examples/errors.feature

@@ -6,3 +6,6 @@ Feature: raises errors
   Scenario: Incorrect expectation
     Given there is a monster
     Then it should die
+  @raise_error_for_unimplemented_steps
+  Scenario: Step missing and raise_error_for_unimplemented_steps is set
+    When a step just does not exist

data/gemfiles/Gemfile-rspec-2.14.x

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in turnip.gemspec
+gemspec :path => '..'
+
+gem 'rspec', '~> 2.14.0'

data/gemfiles/Gemfile-rspec-2.99.x

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in turnip.gemspec
+gemspec :path => '..'
+
+gem 'rspec', '~> 2.99.0'

data/gemfiles/Gemfile-rspec-3.0.x

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in turnip.gemspec
+gemspec :path => '..'
+
+gem 'rspec', '~> 3.0.0'

data/lib/turnip.rb

@@ -29,5 +29,3 @@ Turnip.type = :feature
 Module.send(:include, Turnip::Define)
 
 self.extend Turnip::DSL
-
-require "turnip/rspec"

data/lib/turnip/builder.rb

@@ -116,7 +116,7 @@ module Turnip
       end
 
       def to_s
-        description
+        "#{keyword}#{description}"
       end
     end
 

data/lib/turnip/capybara.rb

@@ -2,8 +2,8 @@ require 'capybara/rspec'
 
 RSpec.configure do |config|
   config.before do
-    current_example = example if respond_to?(:example)
-    current_example ||= RSpec.current_example
+    current_example = RSpec.current_example if RSpec.respond_to?(:current_example)
+    current_example ||= example
 
     if self.class.include?(Capybara::DSL) and current_example.metadata[:turnip]
       Capybara.current_driver = Capybara.javascript_driver if current_example.metadata.has_key?(:javascript)

data/lib/turnip/dsl.rb

@@ -1,7 +1,9 @@
 module Turnip
   module DSL
-    def placeholder(name, &block)
-      Turnip::Placeholder.add(name, &block)
+    def placeholder(*name, &block)
+      name.each do |n|
+        Turnip::Placeholder.add(n, &block)
+      end
     end
 
     def step(description, &block)

data/lib/turnip/execute.rb

@@ -1,11 +1,16 @@
 module Turnip
   module Execute
-    def step(description, *extra_args)
-      extra_args.concat(description.extra_args) if description.respond_to?(:extra_args)
+    def step(step_or_description, *extra_args)
+      if step_or_description.respond_to?(:extra_args)
+        description = step_or_description.description
+        extra_args.concat(step_or_description.extra_args)
+      else
+        description = step_or_description
+      end
 
       matches = methods.map do |method|
         next unless method.to_s.start_with?("match: ")
-        send(method.to_s, description.to_s)
+        send(method.to_s, description)
       end.compact
 
       if matches.length == 0

data/lib/turnip/rspec.rb

@@ -48,13 +48,18 @@ module Turnip
           example.metadata[:line_number] = step.line
           example.metadata[:location] = "#{example.metadata[:file_path]}:#{step.line}"
 
+          if ::RSpec.configuration.raise_error_for_unimplemented_steps
+            e.backtrace.unshift "#{feature_file}:#{step.line}:in `#{step.description}'"
+            raise
+          end
+
           if ::RSpec::Version::STRING >= '2.99.0'
             skip("No such step: '#{e}'")
           else
             pending("No such step: '#{e}'")
           end
-        rescue StandardError => e
-          e.backtrace.push "#{feature_file}:#{step.line}:in `#{step.description}'"
+        rescue StandardError, ::RSpec::Expectations::ExpectationNotMetError => e
+          e.backtrace.unshift "#{feature_file}:#{step.line}:in `#{step.description}'"
           raise e
         end
       end
@@ -75,7 +80,7 @@ module Turnip
             before do
               example = Turnip::RSpec.fetch_current_example(self)
               # This is kind of a hack, but it will make RSpec throw way nicer exceptions
-              example.metadata[:file_path] = feature_file
+              example.metadata[:file_path] ||= feature_file
 
               feature.backgrounds.map(&:steps).flatten.each do |step|
                 run_step(feature_file, step)
@@ -83,7 +88,7 @@ module Turnip
             end
             feature.scenarios.each do |scenario|
               instance_eval <<-EOS, feature_file, scenario.line
-                describe scenario.name, scenario.metadata_hash do it(scenario.steps.map(&:description).join(' -> ')) do
+                describe scenario.name, scenario.metadata_hash do it(scenario.steps.map(&:to_s).join(' -> ')) do
                     scenario.steps.each do |step|
                       run_step(feature_file, step)
                     end
@@ -104,4 +109,5 @@ end
   config.include Turnip::RSpec::Execute, turnip: true
   config.include Turnip::Steps, turnip: true
   config.pattern << ",**/*.feature"
+  config.add_setting :raise_error_for_unimplemented_steps, :default => false
 end

data/lib/turnip/version.rb

@@ -1,3 +1,3 @@
 module Turnip
-  VERSION = "1.2.2"
+  VERSION = '1.2.3'
 end

data/spec/builder_spec.rb

@@ -23,6 +23,14 @@ describe Turnip::Builder do
     it 'extracts step keyword' do
       steps.map(&:keyword).should eq(['Given ', 'When ', 'Then '])
     end
+
+    it 'extracts full description' do
+      steps.map(&:to_s).should eq([
+        'Given there is a monster',
+        'When I attack it',
+        'Then it should die'
+      ])
+    end
   end
 
   context "with scenario outlines" do

data/spec/define_and_execute_spec.rb

@@ -41,13 +41,13 @@ describe Turnip::Execute do
   end
 
   it "can be executed with a builder step" do
-    builder_step = double(:to_s => "a cool step", :extra_args => [])
+    builder_step = double(:description => "a cool step", :extra_args => [])
     mod.step("a :test step") { |test| test.upcase }
     obj.step(builder_step).should == "COOL"
   end
 
   it "sends in extra arg from a builder step" do
-    builder_step = double(:to_s => "a cool step", :extra_args => ["foo"])
+    builder_step = double(:description => "a cool step", :extra_args => ["foo"])
     mod.step("a :test step") { |test, foo| test.upcase + foo }
     obj.step(builder_step).should == "COOLfoo"
   end

data/spec/dsl_spec.rb

@@ -55,5 +55,11 @@ describe Turnip::DSL do
       context.placeholder('example') { true }
       Turnip::Placeholder.send(:placeholders).should have_key('example')
     end
+
+    it 'registers the multi placeholder globally' do
+      context.placeholder('example_1', 'example_2') { true }
+      Turnip::Placeholder.send(:placeholders).should have_key('example_1')
+      Turnip::Placeholder.send(:placeholders).should have_key('example_2')
+    end
   end
 end

data/spec/integration_spec.rb

@@ -7,15 +7,17 @@ describe 'The CLI', :type => :integration do
 
   it "shows the correct description" do
     @result.should include('A simple feature')
-    @result.should include('is a simple feature')
+    @result.should include('This is a simple feature')
+    @result.should include('Given there is a monster -> When I attack it -> Then it should die')
   end
 
   it "prints out failures and successes" do
-    @result.should include('38 examples, 3 failures, 5 pending')
+    @result.should include('39 examples, 4 failures, 5 pending')
   end
 
   it "includes features in backtraces" do
     @result.should include('examples/errors.feature:5:in `raise error')
+    @result.should include('examples/errors.feature:11:in `a step just does not exist')
   end
 
   it "includes the right step name when steps call steps" do
@@ -25,13 +27,17 @@ describe 'The CLI', :type => :integration do
   it 'prints line numbers of pending/failure scenario' do
     @result.should include('./examples/pending.feature:3')
     @result.should include('./examples/errors.feature:4')
+    @result.should include('./examples/errors.feature:6')
+    @result.should include('./examples/errors.feature:11')
   end
 
   it 'conforms to line-number option' do
     @result.should include('rspec ./examples/errors.feature:4')
     @result.should include('rspec ./examples/errors.feature:6')
+    @result.should include('rspec ./examples/errors.feature:11')
     result_with_line_number = %x(rspec -fd ./examples/errors.feature:4)
     result_with_line_number.should include('rspec ./examples/errors.feature:4')
     result_with_line_number.should_not include('rspec ./examples/errors.feature:6')
+    result_with_line_number.should_not include('rspec ./examples/errors.feature:11')
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,14 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
+
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
+  config.before(raise_error_for_unimplemented_steps: true) do
+    config.stub(:raise_error_for_unimplemented_steps) { true }
+  end
 end
 
 Dir.glob(File.expand_path("../examples/**/*steps.rb", File.dirname(__FILE__))) { |f| require f }

data/turnip.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rspec", [">=2.0", "<4.0"]
+  s.add_runtime_dependency "rspec", [">=2.14.0", "<4.0"]
   s.add_runtime_dependency "gherkin", ">= 2.5"
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.14.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -113,6 +113,9 @@ files:
 - examples/tags.feature
 - examples/with_backticks.feature
 - examples/with_comments.feature
+- gemfiles/Gemfile-rspec-2.14.x
+- gemfiles/Gemfile-rspec-2.99.x
+- gemfiles/Gemfile-rspec-3.0.x
 - lib/turnip.rb
 - lib/turnip/builder.rb
 - lib/turnip/capybara.rb