spinach 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c66a61a7a2acb9a68481350f9eb89d95e48eec
-  data.tar.gz: 7e2f76bef3a0796aa342bb9bdd0f1589de02e678
+  metadata.gz: b1c11894781bc3f2957b12b1745d9fed1842736c
+  data.tar.gz: 2fb1b64e1bbf60ec8248dbddd7bdce98d096dc73
 SHA512:
-  metadata.gz: 68e0b156aa56a28d06cae2585f6504fda3648ea943db9fb5ccc33ecf5afc2ab9e2be16cd55187f0bc18febd3ab147d25263a7a2130d82c576696ff8b441c09ef
-  data.tar.gz: fdd2eec1dc6d73374f6bbbb7c6b8610c0f73d56cb3110c8e01fb2cf60a46a912a506c09a0abb03173dccb9011b68842691cfc50b240eca9e223370e9d1fb8e16
+  metadata.gz: a7638b77452fc5810f7da5ffe4fbcd0f93ef5e9248d6e44a15538b8a07d8260cf1ff8ee41ae2d463a9f73d6449479feb837c025aab6f70fe55b0677008ebd8aa
+  data.tar.gz: fb0ef915c20adbb72c618579022b17b77f27b4d983ed48b1e6966504d280602e4f238c6ce9d23b7eb1c07e0293204f4b86c20cbf249488ed2fbdac09ebab69f3

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p0
+2.0.0-p247

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+== 0.8.4
+* fixed #138: The pending steps should abort the remaining scenario, but continue running other scenarios
+* added the feature #140: Allow blockless step definitions
+
 == 0.8.3
-* Add ```--fail-fast``` option. When specified, the suite will terminate after the first failed scenario
+* add ```--fail-fast``` option. when specified, the suite will terminate after the first failed scenario
 
 == 0.8.2
 * upgrade to gherkin-ruby 0.3 in order to avoid naming conflicts when using at

data/Gemfile

@@ -11,6 +11,7 @@ group :test do
   gem 'guard-minitest'
   gem 'guard-spinach'
   gem 'capybara', '~> 2.0.0'
+  gem "rspec"
 end
 
 group :darwin do

data/LICENSE

@@ -0,0 +1,9 @@
+Copyright (C) <2013> <Codegram Technologies>
+
+MIT License (Expat)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -353,8 +353,7 @@ You can easily contribute to Spinach. Its codebase is simple and
 
 ## License
 
-MIT License. Copyright 2011 [Codegram Technologies](http://codegram.com)
-
+MIT (Expat) License. Copyright 2011-2013 [Codegram Technologies](http://codegram.com)
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/codegram/spinach/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 

data/features/pending_steps.feature

@@ -0,0 +1,9 @@
+Feature: Pending steps
+  In order to save running time
+  As a developer
+  I want spinach to fail fast when I so desire
+
+  Scenario: multiple scenarios
+    Given I have a feature that has a pending step
+    When I run the feature
+    Then the test stops at the pending step and reported as such

data/features/reporting/pending_feature_reporting.feature

@@ -8,3 +8,9 @@ Feature: Pending feature reporting
     When I run spinach
     Then I should see a message telling me that there's a pending scenario
     And I should see a message showing me the reason of the pending scenario
+ 
+ Scenario: Step definition without body
+    Given I've written a step definition without body
+    When I run spinach
+    Then I should see a message telling me that there's a pending scenario
+    And I should see a message showing me the default reason of the pending scenario

data/features/steps/pending_steps.rb

@@ -0,0 +1,17 @@
+class Spinach::Features::PendingSteps < Spinach::FeatureSteps
+  include Integration::SpinachRunner
+
+  step 'I have a feature that has a pending step' do
+    @feature = Integration::FeatureGenerator.pending_feature_with_multiple_scenario
+  end
+
+  step 'I run the feature' do
+    run_feature @feature
+  end
+
+  step 'the test stops at the pending step and reported as such' do
+    @stdout.must_match("(1) Successful")
+    @stdout.must_match("(0) Failed")
+    @stdout.must_match("(1) Pending")
+  end
+end

data/features/steps/reporting/pending_feature_reporting.rb

@@ -24,6 +24,29 @@ class PendingFeatureReporting < Spinach::FeatureSteps
            pending "This step is pending."
          end
        end')
+
+    @feature = "features/pending_feature.feature"
+  end
+
+  Given "I've written a step definition without body" do
+    write_file(
+      'features/pending_feature.feature',
+      """
+      Feature: A pending feature
+
+      Scenario: This scenario is pending 
+        Given this is also a pending step
+      """)
+
+    write_file(
+      'features/steps/pending_feature.rb',
+      'class APendingFeature < Spinach::FeatureSteps
+
+         feature "A pending feature"
+
+         Given "this is also a pending step"
+       end')
+
     @feature = "features/pending_feature.feature"
   end
 
@@ -38,4 +61,9 @@ class PendingFeatureReporting < Spinach::FeatureSteps
   And "I should see a message showing me the reason of the pending scenario" do
     @stderr.must_include("This step is pending")
   end
+
+  And "I should see a message showing me the default reason of the pending scenario" do
+    @stderr.must_include("step not implemented")
+  end
+
 end

data/features/steps/rspec_compatibility.rb

@@ -25,7 +25,7 @@ Feature: Feature without failures
 
   Given "I have a feature with some failed expectations" do
     write_file('features/feature_with_failures.feature', """
-Feature: Feature with failures
+Feature: Feature with failures in RSpec compatibility test
 
   Scenario: This scenario will fail
     Given true is false
@@ -33,7 +33,7 @@ Feature: Feature with failures
 
     write_file('features/steps/failure_feature.rb',
                'class FeatureWithFailures < Spinach::FeatureSteps
-                  feature "Feature with failures"
+                  feature "Feature with failures in RSpec compatibility test"
                   Given "true is false" do
                     true.should == false
                   end

data/features/support/error_reporting.rb

@@ -5,12 +5,18 @@ module Integration
     include Filesystem
 
     def check_error_messages(n = 1)
-      @stderr.must_match /Failures \(#{n}\)/
+      @stderr.must_match failure_regex(n)
     end
 
     def check_backtrace(n = 1)
-      @stderr.must_match /Failures \(#{n}\)/
-      @stderr.must_match /gems.*(minitest|rspec).*assert_equal/
+      @stderr.must_match failure_regex(n)
+      @stderr.must_match /.*(minitest|rspec).*assert_equal/
+    end
+
+    private
+
+    def failure_regex(n)
+      /Failures \(#{n}\)/
     end
   end
 end

data/features/support/feature_generator.rb

@@ -16,6 +16,19 @@ module Integration
           'features/steps/success_feature.rb', steps
       end
 
+      # Generate a feature with 1 scenario that has a pending step in between
+      #
+      # @return feature_filename
+      #   The feature file name
+      #
+      # @api private
+      def pending_feature_with_multiple_scenario
+        feature_str = pending_feature_str + "\n" + success_scenario
+        steps = pending_step_class_str + pending_step + "\n" + failure_step_definition + success_step + "\nend"
+        write_feature 'features/success_feature.feature', feature_str,
+          'features/steps/pending_feature_with_multiple_scenario.rb', steps
+      end
+
       # Generate a feature that has 2 scenarios. The first one should
       # pass and the second one should fail
       #
@@ -65,13 +78,25 @@ module Integration
       end
 
       def failure_step
-        'class AFailureFeature < Spinach::FeatureSteps
+        %Q|class AFailureFeature < Spinach::FeatureSteps
       feature "A failure feature"
-      Then "I fail" do
+      %{failure_step_definition}
+      |
+      end
+
+      def failure_step_definition
+      'step "I fail" do
         true.must_equal false
       end'
       end
 
+      def pending_feature_str
+        "Feature: A feature with pending steps
+        Scenario: This is scenario will be pending
+        When this is a pending step
+    Then I fail"
+      end
+
       def success_scenario
         'Scenario: This is scenario will succeed
     Then I succeed'
@@ -87,6 +112,18 @@ module Integration
       end'
       end
 
+      def pending_step_class_str
+        %Q|class ApendingFeature < Spinach::FeatureSteps
+        feature "A feature with pending steps"\n\n|
+      end
+
+      def pending_step
+        '
+      step "this is a pending step" do
+        pending "to be implemented"
+      end'
+      end
+
       def success_step_class_str
         %Q|class ASuccessFeature < Spinach::FeatureSteps
         feature "A success feature"\n\n|

data/features/support/spinach_runner.rb

@@ -37,7 +37,7 @@ module Integration
 
     def use_rspec
       write_file('features/support/minitest.rb',
-                "require 'rspec'")
+                "require 'rspec/core'\nrequire 'rspec/expectations'")
     end
   end
 end

data/lib/spinach/dsl.rb

@@ -26,6 +26,7 @@ module Spinach
       #
       # @param [Proc] block
       #   Action to perform in that step.
+      #   If no block is given, step will be defined as pending.
       #
       # @example
       #   These 3 examples are equivalent:
@@ -50,7 +51,11 @@ module Spinach
       #
       # @api public
       def step(step, &block)
-        define_method(Spinach::Support.underscore(step), &block)
+        method_body = if block_given? then block
+                      else lambda { pending "step not implemented" }
+                      end
+
+        define_method(Spinach::Support.underscore(step), &method_body)
       end
 
       alias_method :Given, :step

data/lib/spinach/runner/scenario_runner.rb

@@ -51,7 +51,7 @@ module Spinach
           steps.each do |step|
             Spinach.hooks.run_before_step step, step_definitions
 
-            if @exception
+            if @exception || @has_pending_step
               Spinach.hooks.run_on_skipped_step step, step_definitions
             else
               run_step(step)
@@ -84,6 +84,7 @@ module Spinach
         Spinach.hooks.run_on_undefined_step step, @exception, step_definitions
       rescue Spinach::StepPendingException => e
         e.step = step
+        @has_pending_step = true
         Spinach.hooks.run_on_pending_step step, e
       rescue Exception => e
         @exception = e

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/test/spinach/capybara_test.rb

@@ -96,8 +96,9 @@ Feature: A test feature
       Spinach.config.save_and_open_page_on_failure = true
       @feature_class.any_instance.expects(:save_and_open_page).once
       @feature_runner.run
+      Spinach.config.save_and_open_page_on_failure = false
     end
-    
+
     it "doesn't saves and open the page if the option is deactivated" do
       @feature_runner = Spinach::Runner::FeatureRunner.new(failing_feature)
       Spinach.config.save_and_open_page_on_failure = false

data/test/spinach/reporter_test.rb

@@ -49,6 +49,7 @@ module Spinach
 
       describe "bindings" do
         before do
+          Spinach.hooks.reset
           @reporter.bind
         end
 

data/test/spinach/runner/scenario_runner_test.rb

@@ -154,6 +154,11 @@ module Spinach
             subject.instance_variable_get(:@exception).must_be_kind_of(NilClass)
           end
 
+          it 'sets the has_pending_step' do
+            subject.run_step(@step)
+            subject.instance_variable_get(:@has_pending_step).must_equal(true)
+          end
+
           it 'runs the pending hooks' do
             Spinach.hooks.expects(:run_on_pending_step).with(@step, kind_of(Spinach::StepPendingException))
             subject.run_step(@step)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Josep Jaume Rey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
@@ -173,6 +173,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Guardfile
+- LICENSE
 - README.markdown
 - Rakefile
 - bin/spinach
@@ -183,6 +184,7 @@ files:
 - features/exit_status.feature
 - features/fail_fast.feature
 - features/feature_name_guessing.feature
+- features/pending_steps.feature
 - features/reporting/customized_reporter.feature
 - features/reporting/display_run_summary.feature
 - features/reporting/error_reporting.feature
@@ -197,6 +199,7 @@ files:
 - features/steps/exit_status.rb
 - features/steps/fail_fast_option.rb
 - features/steps/feature_name_guessing.rb
+- features/steps/pending_steps.rb
 - features/steps/reporting/display_run_summary.rb
 - features/steps/reporting/error_reporting.rb
 - features/steps/reporting/pending_feature_reporting.rb
@@ -302,6 +305,7 @@ test_files:
 - features/exit_status.feature
 - features/fail_fast.feature
 - features/feature_name_guessing.feature
+- features/pending_steps.feature
 - features/reporting/customized_reporter.feature
 - features/reporting/display_run_summary.feature
 - features/reporting/error_reporting.feature
@@ -316,6 +320,7 @@ test_files:
 - features/steps/exit_status.rb
 - features/steps/fail_fast_option.rb
 - features/steps/feature_name_guessing.rb
+- features/steps/pending_steps.rb
 - features/steps/reporting/display_run_summary.rb
 - features/steps/reporting/error_reporting.rb
 - features/steps/reporting/pending_feature_reporting.rb
@@ -357,3 +362,4 @@ test_files:
 - test/spinach_test.rb
 - test/support/filesystem.rb
 - test/test_helper.rb
+has_rdoc: