spinach 0.1.4 → 0.1.5

data/test/spinach/runner_test.rb

@@ -40,7 +40,7 @@ describe Spinach::Runner do
     before do
       @feature = stub
       filenames.each do |filename|
-        Spinach::Runner::Feature.expects(:new).
+        Spinach::Runner::FeatureRunner.expects(:new).
           with(filename, anything).
           returns(@feature)
       end

data/test/spinach_test.rb

@@ -2,47 +2,48 @@ require_relative 'test_helper'
 
 describe Spinach do
   before do
-    @feature1 = OpenStruct.new(feature_name: 'User authentication')
-    @feature2 = OpenStruct.new(feature_name: 'Slip management')
-    @feature3 = OpenStruct.new(feature_name: 'File attachments')
-    @feature4 = OpenStruct.new(name: 'UserSendsAMessage')
-    [@feature1, @feature2, @feature3, @feature4].each do |feature|
-      Spinach.features << feature
+    @feature_steps1 = OpenStruct.new(feature_name: 'User authentication')
+    @feature_steps2 = OpenStruct.new(feature_name: 'Slip management')
+    @feature_steps3 = OpenStruct.new(feature_name: 'File attachments')
+    @feature_steps4 = OpenStruct.new(name: 'UserSendsAMessage')
+    [@feature_steps1, @feature_steps2, 
+      @feature_steps3, @feature_steps4].each do |feature|
+      Spinach.feature_steps << feature
     end
   end
 
   describe '#features' do
     it 'returns all the loaded features' do
-      Spinach.features.must_include @feature1
-      Spinach.features.must_include @feature2
-      Spinach.features.must_include @feature3
+      Spinach.feature_steps.must_include @feature_steps1
+      Spinach.feature_steps.must_include @feature_steps2
+      Spinach.feature_steps.must_include @feature_steps3
     end
   end
 
   describe '#reset_features' do
     it 'resets the features to a pristine state' do
-      Spinach.reset_features
-      [@feature1, @feature3, @feature3].each do |feature|
-        Spinach.features.wont_include feature
+      Spinach.reset_feature_steps
+      [@feature_steps1, @feature_steps3, @feature_steps3].each do |feature|
+        Spinach.feature_steps.wont_include feature
       end
     end
   end
 
-  describe '#find_feature' do
+  describe '#find_feature_steps' do
     it 'finds a feature by name' do
-      Spinach.find_feature('User authentication').must_equal @feature1
-      Spinach.find_feature('Slip management').must_equal @feature2
-      Spinach.find_feature('File attachments').must_equal @feature3
+      Spinach.find_feature_steps('User authentication').must_equal @feature_steps1
+      Spinach.find_feature_steps('Slip management').must_equal @feature_steps2
+      Spinach.find_feature_steps('File attachments').must_equal @feature_steps3
     end
 
     describe 'when a feature class does no set a feature_name' do
       it 'guesses the feature class from the feature name' do
-        Spinach.find_feature('User sends a message').must_equal @feature4
+        Spinach.find_feature_steps('User sends a message').must_equal @feature_steps4
       end
 
       it 'raises when it cannot find the class' do
         exception = proc {
-          Spinach.find_feature('This feature does not exist')
+          Spinach.find_feature_steps('This feature does not exist')
         }.must_raise Spinach::FeatureStepsNotFoundException
       end
     end

data/test/test_helper.rb

@@ -13,10 +13,10 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'mocha'
 require 'ostruct'
-require 'purdytest'
 require 'stringio'
 require 'pry'
 require 'fakefs/safe'
+require 'turn'
 
 require 'spinach'
 require 'spinach/capybara'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2152679240 !ruby/object:Gem::Requirement
+  requirement: &2172783760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,21 +24,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152679240
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &2152678820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152678820
+  version_requirements: *2172783760
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2152678400 !ruby/object:Gem::Requirement
+  requirement: &2172783340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,21 +35,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152678400
+  version_requirements: *2172783340
 - !ruby/object:Gem::Dependency
-  name: hooks
-  requirement: &2152677960 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2172782900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2152677960
+  version_requirements: *2172782900
 - !ruby/object:Gem::Dependency
-  name: purdytest
-  requirement: &2152677520 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &2172782480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152677520
+  version_requirements: *2172782480
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2152677060 !ruby/object:Gem::Requirement
+  name: sinatra
+  requirement: &2172782060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152677060
+  version_requirements: *2172782060
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2152676620 !ruby/object:Gem::Requirement
+  name: capybara
+  requirement: &2172781640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152676620
+  version_requirements: *2172781640
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &2152676180 !ruby/object:Gem::Requirement
+  name: aruba
+  requirement: &2172781220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152676180
+  version_requirements: *2172781220
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &2152675720 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &2172780800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152675720
+  version_requirements: *2172780800
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: &2152675280 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &2172780380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152675280
+  version_requirements: *2172780380
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &2152674840 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2172779940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152674840
+  version_requirements: *2172779940
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &2152674400 !ruby/object:Gem::Requirement
+  name: fakefs
+  requirement: &2172779520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152674400
+  version_requirements: *2172779520
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152673980 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &2172779080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152673980
+  version_requirements: *2172779080
 - !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: &2152673560 !ruby/object:Gem::Requirement
+  name: turn
+  requirement: &2172778580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,7 +156,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152673560
+  version_requirements: *2172778580
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -183,14 +172,15 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- .yardopts
 - Gemfile
 - Guardfile
 - Rakefile
 - Readme.md
 - bin/spinach
+- features/automatic_feature_generation.feature
 - features/exit_status.feature
 - features/feature_name_guessing.feature
-- features/generate_features.feature
 - features/reporting/display_run_summary.feature
 - features/reporting/error_reporting.feature
 - features/reporting/show_step_source_location.feature
@@ -217,12 +207,15 @@ files:
 - lib/spinach/generators.rb
 - lib/spinach/generators/feature_generator.rb
 - lib/spinach/generators/step_generator.rb
+- lib/spinach/hookable.rb
+- lib/spinach/hooks.rb
 - lib/spinach/parser.rb
 - lib/spinach/reporter.rb
 - lib/spinach/reporter/stdout.rb
+- lib/spinach/reporter/stdout/error_reporting.rb
 - lib/spinach/runner.rb
-- lib/spinach/runner/feature.rb
-- lib/spinach/runner/scenario.rb
+- lib/spinach/runner/feature_runner.rb
+- lib/spinach/runner/scenario_runner.rb
 - lib/spinach/suites.rb
 - lib/spinach/suites/minitest.rb
 - lib/spinach/suites/rspec.rb
@@ -238,11 +231,14 @@ files:
 - test/spinach/generators/feature_generator_test.rb
 - test/spinach/generators/step_generator_test.rb
 - test/spinach/generators_test.rb
+- test/spinach/hookable_test.rb
+- test/spinach/hooks_test.rb
 - test/spinach/parser_test.rb
+- test/spinach/reporter/stdout/error_reporting_test.rb
 - test/spinach/reporter/stdout_test.rb
 - test/spinach/reporter_test.rb
-- test/spinach/runner/feature_test.rb
-- test/spinach/runner/scenario_test.rb
+- test/spinach/runner/feature_runner_test.rb
+- test/spinach/runner/scenario_runner_test.rb
 - test/spinach/runner_test.rb
 - test/spinach/suites/minitest_test.rb
 - test/spinach/support_test.rb
@@ -262,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3283376077311958142
+      hash: -818234758859156687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3283376077311958142
+      hash: -818234758859156687
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
@@ -279,9 +275,9 @@ signing_key:
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin
 test_files:
+- features/automatic_feature_generation.feature
 - features/exit_status.feature
 - features/feature_name_guessing.feature
-- features/generate_features.feature
 - features/reporting/display_run_summary.feature
 - features/reporting/error_reporting.feature
 - features/reporting/show_step_source_location.feature
@@ -307,11 +303,14 @@ test_files:
 - test/spinach/generators/feature_generator_test.rb
 - test/spinach/generators/step_generator_test.rb
 - test/spinach/generators_test.rb
+- test/spinach/hookable_test.rb
+- test/spinach/hooks_test.rb
 - test/spinach/parser_test.rb
+- test/spinach/reporter/stdout/error_reporting_test.rb
 - test/spinach/reporter/stdout_test.rb
 - test/spinach/reporter_test.rb
-- test/spinach/runner/feature_test.rb
-- test/spinach/runner/scenario_test.rb
+- test/spinach/runner/feature_runner_test.rb
+- test/spinach/runner/scenario_runner_test.rb
 - test/spinach/runner_test.rb
 - test/spinach/suites/minitest_test.rb
 - test/spinach/support_test.rb

data/lib/spinach/runner/scenario.rb

@@ -1,77 +0,0 @@
-require 'hooks'
-
-module Spinach
-  class Runner
-    # A Scenario Runner handles a particular scenario run.
-    #
-    class Scenario
-      attr_reader :feature, :feature_name, :data
-
-      include Hooks
-
-      define_hook :before_run
-      define_hook :on_successful_step
-      define_hook :on_failed_step
-      define_hook :on_error_step
-      define_hook :on_undefined_step
-      define_hook :on_skipped_step
-      define_hook :after_run
-
-      # @param [Feature] feature
-      #   The feature that contains the steps.
-      #
-      # @param [Hash] data
-      #   The parsed feature data.
-      #
-      # @api public
-      def initialize(feature_name, data)
-        @feature_name = feature_name
-        @data = data
-      end
-
-      def steps
-        @steps ||= data['steps']
-      end
-
-      # @return [Feature]
-      #   The feature object used to run this scenario.
-      #
-      # @api public
-      def feature
-        @feature ||= Spinach.find_feature(feature_name).new
-      end
-
-      # Runs this scenario
-      # @return [True, False]
-      #   true if this scenario succeeded, false if not
-      def run
-        run_hook :before_run, data
-        feature.run_hook :before_scenario, data
-        steps.each do |step|
-          feature.run_hook :before_step, step
-          unless @exception
-            begin
-              step_location = feature.execute_step(step['name'])
-              run_hook :on_successful_step, step, step_location
-            rescue *Spinach.config[:failure_exceptions] => e
-              @exception = e
-              run_hook :on_failed_step, step, @exception, step_location
-            rescue Spinach::StepNotDefinedException => e
-              @exception = e
-              run_hook :on_undefined_step, step, @exception
-            rescue Exception => e
-              @exception = e
-              run_hook :on_error_step, step, @exception, step_location
-            end
-          else
-            run_hook :on_skipped_step, step
-          end
-          feature.run_hook :after_step, step
-        end
-        feature.run_hook :after_scenario, data
-        run_hook :after_run, data
-        !@exception
-      end
-    end
-  end
-end

data/test/spinach/runner/scenario_test.rb

@@ -1,120 +0,0 @@
-require_relative '../../test_helper'
-
-describe Spinach::Runner::Scenario do
-  let(:data) do
-    {
-      'name' => 'A cool scenario',
-      'steps' => [
-        {'keyword' => 'Given', 'name' => 'I herd you like steps'},
-        {'keyword' => 'When', 'name' => 'I test steps'},
-        {'keyword' => 'Then', 'name' => 'I go step by step'}
-      ]
-    }
-  end
-
-  let(:feature) { stub_everything }
-  let(:feature_name) { 'My feature' }
-  let(:scenario) {
-    scenario = Spinach::Runner::Scenario.new(feature_name, data)
-    scenario.stubs(feature: feature)
-    scenario
-  }
-
-  describe '#initialize' do
-    it 'lists all the steps' do
-      scenario.steps.count.must_equal 3
-    end
-
-    it 'sets the feature' do
-      scenario.feature.must_equal feature
-    end
-  end
-
-  describe '#feature' do
-    it 'finds the feature given a feature name' do
-      scenario.unstub(:feature)
-      @feature = stub_everything
-      scenario.stubs(feature_name: 'A cool feature')
-      Spinach.expects(:find_feature).with('A cool feature').returns(@feature)
-      scenario.feature
-    end
-  end
-
-  describe '#run' do
-    it 'calls the appropiate feature steps' do
-      feature.expects(:execute_step).with('I herd you like steps')
-      feature.expects(:execute_step).with('I test steps')
-      feature.expects(:execute_step).with('I go step by step')
-      scenario.run
-    end
-
-    describe 'when throwing exceptions' do
-      it 'rescues a MiniTest::Assertion' do
-        feature.expects(:execute_step).raises(MiniTest::Assertion)
-        scenario.expects(:run_hook).with(:before_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(:after_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(
-          :on_failed_step, anything, anything, anything)
-        scenario.expects(:run_hook).with(
-          :on_skipped_step, anything, anything).twice
-        scenario.run
-      end
-
-      it 'rescues a Spinach::StepNotDefinedException' do
-        feature.expects(:execute_step).raises(
-          Spinach::StepNotDefinedException.new('bar'))
-        scenario.expects(:run_hook).with(:before_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(:after_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(
-          :on_undefined_step, anything, anything, anything)
-        scenario.expects(:run_hook).with(
-          :on_skipped_step, anything, anything).twice
-        scenario.run
-      end
-
-      it 'rescues any other error' do
-        feature.expects(:execute_step).raises
-        scenario.expects(:run_hook).with(:after_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(:before_run, has_value("A cool scenario"))
-        scenario.expects(:run_hook).with(
-          :on_error_step, anything, anything, anything)
-        scenario.expects(:run_hook).with(
-          :on_skipped_step, anything, anything).twice
-        scenario.run
-      end
-
-      it 'returns an failure' do
-        feature.expects(:execute_step).raises(MiniTest::Assertion)
-        scenario.run.wont_equal nil
-      end
-    end
-
-    it 'runs a step' do
-      feature.expects(:execute_step).with(anything).times(3)
-      scenario.run.must_equal true
-    end
-
-    describe 'hooks' do
-      it 'fires up the scenario hooks' do
-        feature.expects(:execute_step).raises(Spinach::StepNotDefinedException.new('bar'))
-        feature.expects(:run_hook).with(:before_scenario, has_value("A cool scenario"))
-        feature.expects(:run_hook).with(:after_scenario, has_value("A cool scenario"))
-        scenario.run
-      end
-
-      it 'fires up the step hooks' do
-        feature.expects(:execute_step).raises(Spinach::StepNotDefinedException.new('bar'))
-        %w{before_step after_step}.each do |hook|
-          feature.expects(:run_hook).with(
-            hook.to_sym, kind_of(Hash))
-          feature.expects(:run_hook).with(
-            hook.to_sym, kind_of(Hash))
-          feature.expects(:run_hook).with(
-            hook.to_sym, kind_of(Hash))
-        end
-
-        scenario.run
-      end
-    end
-  end
-end