spinach 0.4.2 → 0.5.0

data/.travis.yml

@@ -1,7 +1,4 @@
 env:
  - RBXOPT=-X19 JRUBY_OPTS="--1.9"
 rvm:
-  - 1.9.2
   - 1.9.3
-  # - rbx
-  # - jruby

data/README.markdown

@@ -136,9 +136,52 @@ use private methods, mix in modules or whatever!
 
 Then run your feature again running `spinach` and watch it all turn green! :)
 
-By default Spinach will ignore Scenarios marked with the tag `@wip`. Those are
-meant to be work in progress, scenarios that are pending while you work on
-them. To explicitly run those, use the `--tags` option:
+## Tags
+
+Feature and Scenarios can be marked with tags in the form: `@tag`. Tags can be
+used for different purposes:
+
+- applying some actions using hooks (eg: `@javascript`, `@transaction`, `@vcr`)
+
+        # When using Capybara, you can switch the driver to use another one with
+        # javascript capabilities (Selenium, Poltergeist, capybara-webkit, ...)
+        #
+        # Spinach already integrates with Capybara if you add
+        # `require spinach/capybara` in `features/support/env.rb`.
+        #
+        # This example is extracted from this integration.
+        Spinach.hooks.on_tag("javascript") do
+          ::Capybara.current_driver = ::Capybara.javascript_driver
+        end
+
+- filtering (eg: `@module-a`, `@customer`, `@admin`, `@bug-12`, `@feat-1`)
+
+        # Given a feature file with this content
+
+        @feat-1
+        Feature: So something great
+
+          Scenario: Make it possible
+
+          @bug-12
+          Scenario: Ensure no regression on this
+
+  Then you can run all Scenarios in your suite related to `@feat-1` using:
+
+        spinach --tags @feat-1
+
+  Or only Scenarios related to `@feat-1` and `@bug-12` using:
+
+        spinach --tags @feat-1,@bug-12
+
+  Or only Scenarios related to `@feat-1` excluding `@bug-12` using:
+
+        spinach --tags @feat-1,~@bug-12
+
+By default Spinach will ignore Scenarios marked with the tag `@wip` or whose
+Feature is marked with the tag `@wip`. Those are meant to be work in progress,
+scenarios that are pending while you work on them. To explicitly run those, use
+the `--tags` option:
 
     spinach --tags @wip
 

data/lib/spinach/cli.rb

@@ -123,7 +123,7 @@ module Spinach
     def feature_files
       path = @args.first.to_s
 
-      if File.file?(path)
+      if File.file?(path.split(":").first.to_s)
         @args
       elsif File.directory?(path)
         Dir.glob(File.join(path, '**', '*.feature'))

data/lib/spinach/config.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module Spinach
   # Accesses spinach config. Allows you to configure several runtime options,
   # like the step definitions path.

data/lib/spinach/feature.rb

@@ -1,11 +1,12 @@
 module Spinach
   class Feature
     attr_accessor :line
-    attr_accessor :name, :scenarios
+    attr_accessor :name, :scenarios, :tags
     attr_accessor :background
 
     def initialize
       @scenarios = []
+      @tags = []
     end
 
     def background_steps

data/lib/spinach/generators/feature_generator.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module Spinach
   module Generators
     # A feature generator generates and/or writes an example feature steps class

data/lib/spinach/hooks.rb

@@ -147,10 +147,10 @@ module Spinach
     #     # change capybara driver
     #   end
     def on_tag(tag)
-      before_scenario do |scenario|
+      before_scenario do |scenario, step_definitions|
         tags = scenario.tags
         next unless tags.any?
-        yield(scenario) if tags.include? tag.to_s
+        yield(scenario, step_definitions) if tags.include? tag.to_s
       end
     end
   end

data/lib/spinach/parser/visitor.rb

@@ -38,6 +38,11 @@ module Spinach
       def visit_Feature(node)
         @feature.name = node.name
         node.background.accept(self) if node.background
+
+        @current_tag_set = @feature
+        node.tags.each  { |tag|  tag.accept(self)  }
+        @current_tag_set = nil
+
         node.scenarios.each { |scenario| scenario.accept(self) }
       end
 
@@ -69,9 +74,9 @@ module Spinach
         scenario.name = node.name
         scenario.line = node.line
 
-        @current_scenario = scenario
+        @current_tag_set = scenario
         node.tags.each  { |tag|  tag.accept(self)  }
-        @current_scenario = nil
+        @current_tag_set = nil
 
         @current_step_set = scenario
         node.steps.each { |step| step.accept(self) }
@@ -87,7 +92,7 @@ module Spinach
       #
       # @api public
       def visit_Tag(node)
-        @current_scenario.tags << node.name
+        @current_tag_set.tags << node.name
       end
 
       # Adds the step to the current scenario.

data/lib/spinach/runner/feature_runner.rb

@@ -55,6 +55,14 @@ module Spinach
 
       private
 
+      def feature_tags
+        if @feature.respond_to?(:tags)
+          @feature.tags
+        else
+          []
+        end
+      end
+
       def run_scenarios!
         scenarios.each_with_index do |scenario, current_scenario_index|
           if run_scenario?(scenario, current_scenario_index)
@@ -65,7 +73,8 @@ module Spinach
       end
 
       def run_scenario?(scenario, current_scenario_index)
-        match_line(current_scenario_index) && TagsMatcher.match(scenario.tags)
+        match_line(current_scenario_index) && 
+          TagsMatcher.match(feature_tags | scenario.tags)
       end
 
       def match_line(current_scenario_index)

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spinach.gemspec

@@ -9,7 +9,7 @@ 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-ruby', '~> 0.1.0'
+  gem.add_runtime_dependency 'gherkin-ruby', '~> 0.2.0'
   gem.add_runtime_dependency 'colorize'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'minitest', '~> 2.0'
+  gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'turn'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/spinach/cli_test.rb

@@ -145,6 +145,17 @@ describe Spinach::Cli do
       end
     end
 
+    describe 'when a particular feature list is passed with line' do
+      it 'runs the feature' do
+        cli = Spinach::Cli.new(['features/some_feature.feature:10'])
+        File.expects(:file?).with('features/some_feature.feature').returns(true)
+
+        Spinach::Runner.expects(:new).with(['features/some_feature.feature:10']).
+          returns(stub(:run))
+        cli.run
+      end
+    end
+
     describe 'when no feature is passed' do
       it 'runs the feature' do
         cli = Spinach::Cli.new([])

data/test/spinach/hooks_test.rb

@@ -31,16 +31,28 @@ describe Spinach::Hooks do
       let(:scenario) do
         stub(tags: ['javascript', 'capture'])
       end
+      let(:step_definitions) do
+        stub(something: "step_definitions")
+      end
 
       it "calls the block if the scenario includes the tag" do
         assertion = false
         subject.on_tag('javascript') do
           assertion = true
         end
-        subject.run_before_scenario(scenario)
+        subject.run_before_scenario(scenario, step_definitions)
         assertion.must_equal true
       end
 
+      it "passes in the step_definitions" do
+        assertion = false
+        subject.on_tag('javascript') do |scenario, step_definitions|
+          assertion = step_definitions.something
+        end
+        subject.run_before_scenario(scenario, step_definitions)
+        assertion.must_equal "step_definitions"
+      end
+
       it "doesn't call the block if the scenario doesn't include the tag" do
         assertion = false
         subject.on_tag('screenshot') do

data/test/spinach/parser/visitor_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative '../../test_helper'
 
 module Spinach
   class Parser
@@ -24,8 +24,14 @@ module Spinach
       describe '#visit_Feature' do
         before do
           @background = stub_everything
+          @tags  = [stub_everything, stub_everything, stub_everything]
           @scenarios = [stub_everything, stub_everything, stub_everything]
-          @node  = stub(scenarios: @scenarios, name: 'Go shopping', background: @background)
+          @node  = stub(
+            scenarios: @scenarios,
+            name: 'Go shopping',
+            background: @background,
+            tags: @tags
+          )
         end
 
         it 'sets the name' do
@@ -33,6 +39,13 @@ module Spinach
           visitor.feature.name.must_equal 'Go shopping'
         end
 
+        it 'sets the tags' do
+          @tags.each do |step|
+            step.expects(:accept).with visitor
+          end
+          visitor.visit_Feature(@node)
+        end
+
         it 'iterates over its children' do
           @scenarios.each do |scenario|
             scenario.expects(:accept).with visitor
@@ -121,6 +134,7 @@ module Spinach
           tags     = ['tag1', 'tag2', 'tag3']
           scenario = stub(tags: tags)
           visitor.instance_variable_set(:@current_scenario, scenario)
+          visitor.instance_variable_set(:@current_tag_set, scenario)
 
           visitor.visit_Tag(stub(name: 'tag4'))
           scenario.tags.must_equal ['tag1', 'tag2', 'tag3', 'tag4']

data/test/spinach/runner/feature_runner_test.rb

@@ -114,14 +114,14 @@ describe Spinach::Runner::FeatureRunner do
     describe "when running for specific tags configured" do
 
       before do
-        @feature = stub('feature', name: 'Feature')
+        @feature = stub('feature', name: 'Feature', tags: ["feature_tag"])
         Spinach.stubs(:find_step_definitions).returns(true)
-        @scenario = stub(line: 4, tags: [])
+        @scenario = stub(line: 4, tags: ["scenario_tag"])
         @feature.stubs(:scenarios).returns [@scenario]
       end
 
       it "runs matching scenario" do
-        Spinach::TagsMatcher.stubs(:match).returns true
+        Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns true
         Spinach::Runner::ScenarioRunner.expects(:new).with(@scenario).returns stub(run: true)
 
         @runner = Spinach::Runner::FeatureRunner.new(@feature)
@@ -129,7 +129,7 @@ describe Spinach::Runner::FeatureRunner do
       end
 
       it "skips scenarios that do not match" do
-        Spinach::TagsMatcher.stubs(:match).returns false
+        Spinach::TagsMatcher.expects(:match).with(["feature_tag", "scenario_tag"]).returns false
         Spinach::Runner::ScenarioRunner.expects(:new).never
 
         @runner = Spinach::Runner::FeatureRunner.new(@feature)

data/test/support/filesystem.rb

@@ -3,7 +3,7 @@ require "fileutils"
 module Filesystem
   def in_current_dir(&block)
     dir = "tmp/fs"
-    FileUtils.mkdir(dir)
+    FileUtils.mkdir_p(dir)
     Dir.chdir(dir, &block)
   ensure
     FileUtils.rm_rf(dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,27 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168662800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  version_requirements: *2168662800
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168662100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,15 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168662100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168661120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,15 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168661120
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168660500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -72,15 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168660500
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168687040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,15 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168687040
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168686600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,15 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168686600
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168686180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,15 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168686180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168685760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -136,15 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168685760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168685340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -152,31 +112,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168685340
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168684920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *2168684920
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2168684500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -184,12 +134,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2168684500
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -304,15 +249,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2039979269723833359
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2039979269723833359
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin