spinach 0.1.5.4 → 0.2.0.1

data/lib/spinach/reporter/stdout/error_reporting.rb

@@ -36,7 +36,7 @@ module Spinach
           if undefined_features.any?
             error.puts "  Undefined features (#{undefined_features.length})".light_yellow
             undefined_features.each do |feature|
-              error.puts "    #{feature['name']}".yellow
+              error.puts "    #{feature.name}".yellow
             end
           end
         end
@@ -93,7 +93,7 @@ module Spinach
         #
         def summarized_error(error)
           feature, scenario, step, exception = error
-          summary = "    #{feature['name']} :: #{scenario['name']} :: #{full_step step}"
+          summary = "    #{feature.name} :: #{scenario.name} :: #{full_step step}"
           if exception.kind_of?(Spinach::StepNotDefinedException)
             summary.yellow
           else

data/lib/spinach/runner.rb

@@ -54,14 +54,17 @@ module Spinach
     # @api public
     def run
       require_dependencies
-      require_suites
+      require_frameworks
 
       Spinach.hooks.run_before_run
 
       successful = true
 
-      filenames.each do |filename|
-        success = FeatureRunner.new(filename).run
+      filenames.map do |filename|
+        filename.split(':')
+      end.each do |filename, line|
+        feature = Parser.open_file(filename).parse
+        success = FeatureRunner.new(feature, line).run
         successful = false unless success
       end
 
@@ -80,10 +83,10 @@ module Spinach
       end
     end
 
-    # Requires the test suite support
+    # Requires the test framework support
     #
-    def require_suites
-      require_relative 'suites'
+    def require_frameworks
+      require_relative 'frameworks'
     end
 
     # @return [Array<String>] files

data/lib/spinach/runner/feature_runner.rb

@@ -3,30 +3,19 @@ module Spinach
     # A feature runner handles a particular feature run.
     #
     class FeatureRunner
+      attr_reader :feature
 
-      # The file that describes the feature.
-      attr_reader :filename
-
-      # @param [String] filename
-      #   path to the feature file. Scenario line could be passed to run just
-      #   that scenario.
-      #   @example feature/a_cool_feature.feature:12
-      #
-      # @api public
-      def initialize(filename)
-        @filename, @scenario_line = filename.split(':')
-      end
-
-      # The file taht describes the feature.
+      # @param [Gherkin::AST::Feature] feature
+      #   The feature to run.
       #
-      attr_reader :filename
-
-      # @return [Hash]
-      #   The parsed data for this feature.
+      # @param [#to_i] line
+      #   If a scenario line is passed, then only the scenario defined on that
+      #   line will be run.
       #
       # @api public
-      def data
-        @data ||= Spinach::Parser.open_file(filename).parse
+      def initialize(feature, line=nil)
+        @feature = feature
+        @line    = line.to_i if line
       end
 
       # @return [String]
@@ -34,15 +23,15 @@ module Spinach
       #
       # @api public
       def feature_name
-        @feature_name ||= data['name']
+        @feature.name
       end
 
-      # @return [Hash]
+      # @return [Array<Gherkin::AST::Scenario>]
       #   The parsed scenarios for this runner's feature.
       #
       # @api public
       def scenarios
-        @scenarios ||= (data['elements'] || [])
+        @feature.scenarios
       end
 
       # Runs this feature.
@@ -52,21 +41,38 @@ module Spinach
       #
       # @api public
       def run
-        Spinach.hooks.run_before_feature data
-        if Spinach.find_feature_steps(feature_name)
-          scenarios.each do |scenario|
-            if !@scenario_line || scenario['line'].to_s == @scenario_line
-              success = ScenarioRunner.new(feature_name, scenario).run
-              @failed = true unless success
-            end
-          end
+        Spinach.hooks.run_before_feature @feature
+        if Spinach.find_step_definitions(feature_name)
+          run_scenarios!
         else
-          Spinach.hooks.run_on_undefined_feature data
-          @failed = true
+          undefined_steps!
         end
-        Spinach.hooks.run_after_feature data
+        Spinach.hooks.run_after_feature @feature
         !@failed
       end
+
+      private
+
+      def run_scenarios!
+        scenarios.each_with_index do |scenario, current_scenario_index|
+          if match(current_scenario_index)
+            success = ScenarioRunner.new(scenario).run
+            @failed = true unless success
+          end
+        end
+      end
+
+      def match(current_scenario_index)
+        return true unless @line
+        return false if @line<scenarios[current_scenario_index].line
+        next_scenario = scenarios[current_scenario_index+1]
+        !next_scenario || @line<next_scenario.line
+      end
+
+      def undefined_steps!
+        Spinach.hooks.run_on_undefined_feature @feature
+        @failed = true
+      end
     end
   end
 end

data/lib/spinach/runner/scenario_runner.rb

@@ -3,61 +3,88 @@ module Spinach
     # A Scenario Runner handles a particular scenario run.
     #
     class ScenarioRunner
-      attr_reader :feature_name, :data
-
-      # @param [String] feature_name
-      #   The feature name
+      # @param [Gherkin::AST::Scenario] scenario
+      #   The scenario.
       #
-      # @param [Hash] data
-      #   The parsed feature data.
+      # @api public
+      def initialize(scenario)
+        @scenario = scenario
+      end
+
+      # @return [Gherkin::AST::Feature>]
+      #   The feature containing the scenario.
       #
       # @api public
-      def initialize(feature_name, data)
-        @feature_name = feature_name
-        @data = data
+      def feature
+        @scenario.feature
       end
 
+      # @return [Array<Gherkin::AST::Step>]
+      #   An array of steps.
+      #
+      # @api public
       def steps
-        @steps ||= data['steps']
+        feature.background_steps + @scenario.steps
       end
 
       # @return [FeatureSteps]
-      #   The feature object used to run this scenario.
+      #   The step definitions for the current feature.
       #
       # @api public
-      def feature_steps
-        @feature_steps ||= Spinach.find_feature_steps(feature_name).new
+      def step_definitions
+        @step_definitions ||= Spinach.find_step_definitions(feature.name).new
       end
 
-      # Runs this scenario
-      # @return [True, False]
-      #   true if this scenario succeeded, false if not
+      # Runs the scenario, capturing any exception, and running the
+      # corresponding hooks.
+      #
+      # @return [true, false]
+      #   Whether the scenario succeeded or not.
+      #
+      # @api public
       def run
-        Spinach.hooks.run_before_scenario data
-        steps.each do |step|
-          Spinach.hooks.run_before_step step
-          unless @exception
-            begin
-              step_location = feature_steps.execute_step(step['name'])
-              Spinach.hooks.run_on_successful_step step, step_location
-            rescue *Spinach.config[:failure_exceptions] => e
-              @exception = e
-              Spinach.hooks.run_on_failed_step step, @exception, step_location
-            rescue Spinach::StepNotDefinedException => e
-              @exception = e
-              Spinach.hooks.run_on_undefined_step step, @exception
-            rescue Exception => e
-              @exception = e
-              Spinach.hooks.run_on_error_step step, @exception, step_location
+        Spinach.hooks.run_before_scenario @scenario
+        scenario_run = false
+        Spinach.hooks.run_around_scenario @scenario do
+          scenario_run = true
+          steps.each do |step|
+            Spinach.hooks.run_before_step step
+
+            if @exception
+              Spinach.hooks.run_on_skipped_step step
+            else
+              run_step(step)
             end
-          else
-            Spinach.hooks.run_on_skipped_step step
+
+            Spinach.hooks.run_after_step step
           end
-          Spinach.hooks.run_after_step step
         end
-        Spinach.hooks.run_after_scenario data
+        raise "around_scenario hooks *must* yield" if !scenario_run && !@exception
+        Spinach.hooks.run_after_scenario @scenario
         !@exception
       end
+
+      # Runs a particular step.
+      #
+      # @param [Gherkin::AST::Step] step
+      #   The step to be run.
+      #
+      # @api semipublic
+      def run_step(step)
+        step_location = step_definitions.step_location_for(step.name)
+        step_definitions.execute(step)
+        Spinach.hooks.run_on_successful_step step, step_location
+      rescue *Spinach.config[:failure_exceptions] => e
+        @exception = e
+        Spinach.hooks.run_on_failed_step step, @exception, step_location
+      rescue Spinach::StepNotDefinedException => e
+        @exception = e
+        Spinach.hooks.run_on_undefined_step step, @exception
+      rescue Exception => e
+        @exception = e
+        Spinach.hooks.run_on_error_step step, @exception, step_location
+      end
+
     end
   end
 end

data/lib/spinach/scenario.rb

@@ -0,0 +1,12 @@
+module Spinach
+  class Scenario
+    attr_accessor :line
+    attr_accessor :name, :steps, :tags, :feature
+
+    def initialize(feature)
+      @feature = feature
+      @steps   = []
+      @tags    = []
+    end
+  end
+end

data/lib/spinach/step.rb

@@ -0,0 +1,10 @@
+module Spinach
+  class Step
+    attr_accessor :line
+    attr_accessor :name, :keyword, :scenario
+
+    def initialize(scenario)
+      @scenario = scenario
+    end
+  end
+end

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.1.5.4"
+  VERSION = "0.2.0.1"
 end

data/spinach.gemspec

@@ -9,18 +9,18 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Spinach is a BDD framework on top of gherkin}
   gem.homepage      = "http://github.com/codegram/spinach"
 
-  gem.add_runtime_dependency 'gherkin', '2.5.4'
+  gem.add_runtime_dependency 'gherkin-ruby', '~> 0.0.2'
   gem.add_runtime_dependency 'colorize'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'sinatra'
   gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'open4'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'fakefs'
-  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'minitest', '~> 2.8.0'
   gem.add_development_dependency 'turn'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/spinach/background_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Spinach
+  describe Background do
+  end
+end

data/test/spinach/capybara_test.rb

@@ -27,6 +27,19 @@ describe Spinach::FeatureSteps::Capybara do
     end.new
   end
 
+  let(:parsed_feature) { Spinach::Parser.new("""
+Feature: A test feature
+  Scenario: A test scenario
+    Given Hello
+    Then Goodbye
+
+  @javascript
+  Scenario: Another test scenario
+    Given Hello
+    Then Goodbye
+""").parse
+  }
+
   it 'includes capybara into all features' do
     @feature.kind_of? Capybara
   end
@@ -37,22 +50,26 @@ describe Spinach::FeatureSteps::Capybara do
   end
 
   it 'resets the capybara session after each scenario' do
-    @feature_runner = Spinach::Runner::FeatureRunner.new(
-      'a_feature.feature')
+    @feature_runner = Spinach::Runner::FeatureRunner.new(parsed_feature)
 
-    @feature_runner.stubs(data: Spinach::Parser.new('
-      Feature: A test feature
-        Scenario: A test scenario
-          Given Hello
-          Then Goodbye
-        Scenario: Another test scenario
-          Given Hello
-          Then Goodbye
-    ').parse).at_least_once
+    Capybara.current_session.expects(:reset!).at_least_once
 
-    Spinach::Runner::ScenarioRunner.any_instance.stubs(feature_steps: @feature)
+    @feature_runner.run
+  end
 
-    Capybara.current_session.expects(:reset!).at_least_once
+  it 'resets the javascript driver after each scenario' do
+    @feature_runner = Spinach::Runner::FeatureRunner.new(parsed_feature)
+
+    Capybara.expects(:use_default_driver).at_least(2)
+
+    @feature_runner.run
+  end
+
+  it 'changes the javascript driver when an scenario has the @javascript tag' do
+    @feature_runner = Spinach::Runner::FeatureRunner.new(parsed_feature)
+
+    Capybara.expects(:javascript_driver).at_least(1)
+    Capybara.expects(:current_driver=).at_least(1)
 
     @feature_runner.run
   end

data/test/spinach/cli_test.rb

@@ -18,7 +18,19 @@ describe Spinach::Cli do
       end
     end
 
-    describe 'backtrace' do
+    describe 'features_path' do
+      %w{-f --features_path}.each do |opt|
+        it 'sets the given features_path' do
+          config = Spinach::Config.new
+          Spinach.stubs(:config).returns(config)
+          cli = Spinach::Cli.new([opt,"custom_path"])
+          cli.options
+          config.features_path.must_equal 'custom_path'
+        end
+      end
+    end
+
+    describe 'generate' do
       %w{-g --generate}.each do |opt|
         it 'inits the generator if #{opt}' do
           Spinach::Generators.expects(:bind)
@@ -40,6 +52,39 @@ describe Spinach::Cli do
         end
       end
     end
+
+    describe 'config_path' do
+      %w{-c --config_path}.each do |opt|
+        it "sets the config path" do
+          config = Spinach::Config.new
+          Spinach.stubs(:config).returns(config)
+          cli = Spinach::Cli.new([opt, 'config_file'])
+          config.expects(:parse_from_file)
+          cli.options
+          config.config_path.must_equal 'config_file'
+        end
+
+        it "gets overriden by the other cli options" do
+          config = Spinach::Config.new
+          Spinach.stubs(:config).returns(config)
+          YAML.stubs(:load_file).returns({features_path: 'my_path'})
+          cli = Spinach::Cli.new(['-f', 'another_path', opt, 'config_file'])
+          cli.options
+          config.features_path.must_equal 'another_path'
+        end
+      end
+    end
+
+    describe 'undefined option' do
+      %w{-lorem --ipsum}.each do |opt|
+        it 'exits and outputs error message with #{opt}' do
+          cli = Spinach::Cli.new([opt])
+          cli.expects(:exit)
+          cli.expects(:puts).with("Invalid option: #{opt}")
+          options = cli.options
+        end
+      end
+    end
   end
 
   describe '#init_reporter' do