spinach 0.1.5.3 → 0.1.5.4

data/.rvmrc

@@ -1 +1 @@
-rvm --create use 1.9.2@spinach
+rvm --create use 1.9.3@spinach

data/README.markdown

@@ -24,7 +24,7 @@ Start by adding spinach to your Gemfile:
 
     group :test do
       gem 'spinach'
-      # along with gem 'minitest' or gem 'rspec'
+      # gem 'rspec'
     end
 
 Spinach works out-of-the-box with your favorite test suite, but you can also
@@ -136,15 +136,15 @@ after any feature, scenario or step execution.
 
 So, for example, you could:
 
-    Spinach.before_scenario do |data|
+    Spinach.hooks.before_scenario do |data|
       clear_database
     end
 
-    Spinach.on_successful_step do |step_data, location|
+    Spinach.hooks.on_successful_step do |step_data, location|
       count_steps(step_data)
     end
 
-    Spinach.after_run do |status|
+    Spinach.hooks.after_run do |status|
       send_mail if status == 0
     end
 
@@ -161,8 +161,29 @@ Use [spinach-rails](http://github.com/codegram/spinach-rails)
 
 Check out our [spinach-sinatra demo](https://github.com/codegram/spinach-sinatra-demo)
 
+## Resources
+
+* [Landing page](http://codegram.github.com/spinach)
+* [Slides](http://codegram.github.com/spinach-presentation)
+* [Blog post](http://blog.codegram.com/2011/10/how-to-achieve-more-clean-encapsulated-modular-step-definitions-with-spinach)
+* [API Documentation](http://rubydoc.info/github/codegram/spinach/master/frames)
+* [Google group](https://groups.google.com/forum/#!forum/spinach_bdd)
+
+### Related gems
+
+* [guard-spinach](http://github.com/codegram/guard-spinach)
+* [spinach-rails](http://github.com/codegram/spinach-rails)
+
+### Demos
+
+* [spinach rails demo](https://github.com/codegram/spinach-rails-demo)
+* [spinach sinatra demo](https://github.com/codegram/spinach-sinatra-demo)
+
+
 ## Contributing
 
+* [List of spinach contributors](https://github.com/codegram/spinach/contributors)
+
 You can easily contribute to Spinach. Its codebase is simple and
 [extensively documented][documentation].
 

data/features/rspec_compatibility.feature

@@ -7,3 +7,8 @@ Feature: RSpec compatibility
     Given I have a feature with some failed expectations
     When I run "spinach" with rspec
     Then I should see the failure count along with their messages
+
+  Scenario: RSpec with capybara
+    Given I have a sinatra app with some capybara-based expectations
+    When I run "spinach" with rspec
+    Then there should be no error

data/features/steps/rspec_compatibility.rb

@@ -25,13 +25,56 @@ class RSpecCompatibility < Spinach::FeatureSteps
                     # joking!
                   end
                 end')
+    @feature = 'feature_with_failures'
   end
 
   When "I run \"spinach\" with rspec" do
-    run_feature 'features/feature_with_failures.feature', suite: :rspec
+    @feature =
+    run_feature "features/#{@feature}.feature", suite: :rspec
   end
 
   Then "I should see the failure count along with their messages" do
     check_error_messages(1)
   end
+
+  Given  'I have a sinatra app with some capybara-based expectations' do
+    write_file("features/support/app.rb", '
+      require "sinatra"
+      require "spinach/capybara"
+      app = Sinatra::Application.new do
+        get "/" do
+          \'Hello world!\'
+        end
+      end
+      Capybara.app = app
+    ')
+
+    write_file('features/greeting.feature',
+               'Feature: Greeting
+
+                Scenario: Greeting
+                  Given I am on the front page
+                  Then I should see hello world
+               ')
+
+    write_file('features/steps/greeting.rb',
+               'require "spinach/capybara"
+                class Greeting < Spinach::FeatureSteps
+                  include Spinach::FeatureSteps::Capybara
+
+                  Given "I am on the front page" do
+                    visit "/"
+                  end
+
+                  Then "I should see hello world" do
+                    page.should have_content("Hello world")
+                  end
+                end')
+    @feature = 'greeting'
+  end
+
+  Given  'There should be no error' do
+    last_exit_status.must_equal 0
+  end
+
 end

data/features/support/spinach_runner.rb

@@ -7,6 +7,11 @@ module Integration
     def self.included(base)
       Spinach.hooks.before_scenario do
         @aruba_timeout_seconds = 6
+        if respond_to?(:in_current_dir)
+          in_current_dir do
+            run "rm -fR rails_app"
+          end
+        end
       end
     end
 

data/lib/spinach/capybara.rb

@@ -24,6 +24,11 @@ module Spinach
       def self.included(base)
         base.class_eval do
           include ::Capybara::DSL
+          if defined?(RSpec)
+            require 'rspec/matchers'
+            require 'capybara/rspec'
+            include ::Capybara::RSpecMatchers
+          end
         end
         Spinach.hooks.before_scenario do
           ::Capybara.current_session.reset! if ::Capybara.app

data/lib/spinach/hooks.rb

@@ -10,7 +10,7 @@ module Spinach
     # Runs before the entire spinach run
     #
     # @example
-    #   Spinach.before_run do
+    #   Spinach.hooks.before_run do
     #     # Whatever
     #   end
     hook :before_run
@@ -18,7 +18,7 @@ module Spinach
     # Runs after the entire spinach run
     #
     # @example
-    #   Spinach.after_run do |status|
+    #   Spinach.hooks.after_run do |status|
     #     # status is true when the run is successful, false otherwise
     #   end
     hook :after_run
@@ -26,7 +26,7 @@ module Spinach
     # Runs before every feature,
     #
     # @example
-    #   Spinach.before_feature do |feature_data|
+    #   Spinach.hooks.before_feature do |feature_data|
     #     # feature_data is a hash of the parsed feature data
     #   end
     hook :before_feature
@@ -34,7 +34,7 @@ module Spinach
     # Runs after every feature
     #
     # @example
-    #   Spinach.after_feature do |feature_data|
+    #   Spinach.hooks.after_feature do |feature_data|
     #     # feature_data is a hash of the parsed feature data
     #   end
     hook :after_feature
@@ -42,7 +42,7 @@ module Spinach
     # Runs when an undefined feature is found
     #
     # @example
-    #   Spinach.on_undefined_feature do |feature_data, exception|
+    #   Spinach.hooks.on_undefined_feature do |feature_data, exception|
     #     # feature_data is a hash of the parsed feature data
     #     # exception contains the thrown exception
     #   end
@@ -51,7 +51,7 @@ module Spinach
     # Runs before every scenario
     #
     # @example
-    #   Spinach.before_scenario do |scenario_data|
+    #   Spinach.hooks.before_scenario do |scenario_data|
     #     # feature_data is a hash of the parsed scenario data
     #   end
     hook :before_scenario
@@ -59,7 +59,7 @@ module Spinach
     # Runs after every scenario
     #
     # @example
-    #   Spinach.after_scenario do |scenario_data|
+    #   Spinach.hooks.after_scenario do |scenario_data|
     #     # feature_data is a hash of the parsed scenario data
     #   end
     hook :after_scenario
@@ -67,7 +67,7 @@ module Spinach
     # Runs before every step execution
     #
     # @example
-    #   Spinach.before_step do |step_data|
+    #   Spinach.hooks.before_step do |step_data|
     #     # step_data contains a hash with this step's data
     #   end
     hook :before_step
@@ -75,7 +75,7 @@ module Spinach
     # Runs after every step execution
     #
     # @example
-    #   Spinach.before_step do |step_data|
+    #   Spinach.hooks.before_step do |step_data|
     #     # step_data contains a hash with this step's data
     #   end
     hook :after_step
@@ -83,7 +83,7 @@ module Spinach
     # Runs after every successful step execution
     #
     # @example
-    #   Spinach.on_successful_step do |step_data, location|
+    #   Spinach.hooks.on_successful_step do |step_data, location|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -93,7 +93,7 @@ module Spinach
     # Runs after every failed step execution
     #
     # @example
-    #   Spinach.on_failed_step do |step_data, location|
+    #   Spinach.hooks.on_failed_step do |step_data, location|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -103,7 +103,7 @@ module Spinach
     # Runs after every step execution that raises an exception
     #
     # @example
-    #   Spinach.on_error_step do |step_data, location|
+    #   Spinach.hooks.on_error_step do |step_data, location|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -113,7 +113,7 @@ module Spinach
     # Runs every time a step which is not defined is called
     #
     # @example
-    #   Spinach.on_undefined_step do |step_data, location|
+    #   Spinach.hooks.on_undefined_step do |step_data, location|
     #     # step_data contains a hash with this step's data
     #     # step_location contains a string indication this step definition's
     #     # location
@@ -124,9 +124,26 @@ module Spinach
     # one just before.
     #
     # @example
-    #   Spinach.on_undefined_step do |step_data|
+    #   Spinach.hooks.on_undefined_step do |step_data|
     #     # step_data contains a hash with this step's data
     #   end
     hook :on_skipped_step
+
+    # Runs before running a scenario with a particular tag
+    #
+    # @param [String] tag
+    #   the tag to match
+    #
+    # @example
+    #   Spinach.hooks.on_tag('javascript') do
+    #     # change capybara driver
+    #   end
+    def on_tag(tag)
+      before_scenario do |data|
+        next unless data["tags"]
+        tags = data["tags"].map{ |tag| tag["name"].gsub(/^@/, "") }
+        yield(data) if tags.include? tag.to_s
+      end
+    end
   end
 end

data/lib/spinach/runner.rb

@@ -70,11 +70,12 @@ module Spinach
       successful
     end
 
-    # Loads step definitions and support files.
+    # Loads support files and step definitions, ensuring that env.rb is loaded
+    # first.
     #
     # @api public
     def require_dependencies
-      (support_files + step_definition_files).each do |file|
+      required_files.each do |file|
         require file
       end
     end
@@ -95,14 +96,30 @@ module Spinach
       )
     end
 
+    # Returns an array of support files inside the support_path. Will
+    # put "env.rb" in the beginning
+    #
     # @return [Array<String>] files
     #   The support files.
     #
     # @api public
     def support_files
-      Dir.glob(
+      support_files = Dir.glob(
         File.expand_path File.join(support_path, '**', '*.rb')
       )
+      environment_file = support_files.find do |f|
+        f.include?(File.join support_path, 'env.rb')
+      end
+      support_files.unshift(environment_file).compact.uniq
+    end
+
+    # @return [Array<String>] files
+    #   All support files with env.rb ordered first, followed by the step
+    #   definitions.
+    #
+    # @api public
+    def required_files
+      support_files + step_definition_files
     end
   end
 end

data/lib/spinach/support.rb

@@ -53,7 +53,7 @@ module Spinach
     #   # => "I\'ve been bad"
     #
     def self.escape_single_commas(text)
-      text.sub("'", "\\\\'")
+      text.gsub("'", "\\\\'")
     end
   end
 end

data/lib/spinach/version.rb

@@ -1,4 +1,4 @@
 module Spinach
   # Spinach version.
-  VERSION = "0.1.5.3"
+  VERSION = "0.1.5.4"
 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'
+  gem.add_runtime_dependency 'gherkin', '2.5.4'
   gem.add_runtime_dependency 'colorize'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'mocha'

data/test/spinach/hooks_test.rb

@@ -9,19 +9,46 @@ describe Spinach::Hooks do
     %w{before_run after_run before_feature after_feature on_undefined_feature
     before_scenario after_scenario before_step after_step on_successful_step
     on_failed_step on_error_step on_undefined_step on_skipped_step}.each do |callback|
-      it "responds to #{callback}" do
-        subject.must_respond_to callback
+      describe "#{callback}" do
+        it "responds to #{callback}" do
+          subject.must_respond_to callback
+        end
+
+        it "executes the hook with params" do
+          array = []
+          block = Proc.new do |arg1, arg2|
+            array << arg1
+            array << arg2
+          end
+          subject.send(callback, &block)
+          subject.send("run_#{callback}", 1, 2)
+          array.must_equal [1, 2]
+        end
+      end
+    end
+    describe "#on_tag" do
+      let(:data) do
+        {
+          'tags' => [{'name' => '@javascript'}, {'name' => '@capture'}]
+        }
+      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(data)
+        assertion.must_equal true
       end
 
-      it "executes the hook with params" do
-        array = []
-        block = Proc.new do |arg1, arg2|
-          array << arg1
-          array << arg2
+      it "doesn't call the block if the scenario doesn't include the tag" do
+        assertion = false
+        subject.on_tag('screenshot') do
+          assertion = true
         end
-        subject.send(callback, &block)
-        subject.send("run_#{callback}", 1, 2)
-        array.must_equal [1, 2]
+        subject.run_before_scenario(data)
+        assertion.wont_equal true
       end
     end
   end

data/test/spinach/runner_test.rb

@@ -56,15 +56,27 @@ describe Spinach::Runner do
       runner.run
     end
   end
+
   describe '#require_dependencies' do
     it 'requires support files and step definitions' do
       runner.stubs(
-        support_files: ['a', 'b'], step_definition_files: ['c', 'd']
+        required_files: ['a', 'b']
       )
-      %w{a b c d}.each do |file|
+      %w{a b}.each do |file|
         runner.expects(:require).with(file)
       end
       runner.require_dependencies
     end
   end
+
+  describe '#required_files' do
+    it 'requires environment files first' do
+      runner.stubs(:step_definition_path).returns('steps')
+      runner.stubs(:support_path).returns('support')
+      Dir.stubs(:glob).returns(['/support/bar.rb', '/support/env.rb', '/support/quz.rb'])
+      runner.stubs(:step_definition_files).returns(['/steps/bar.feature'])
+      runner.required_files.must_equal(['/support/env.rb', '/support/bar.rb', '/support/quz.rb', '/steps/bar.feature'])
+    end
+  end
+
 end

data/test/spinach/support_test.rb

@@ -59,8 +59,8 @@ describe Spinach::Support do
   describe "#escape" do
     it "escapes the name" do
       Spinach::Support.escape_single_commas(
-        "I've been doing bad things"
-      ).must_include "I\\'ve been doing bad things"
+        "I've been doing things I shouldn't be doing"
+      ).must_include "I\\'ve been doing things I shouldn\\'t be doing"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinach
 version: !ruby/object:Gem::Version
-  version: 0.1.5.3
+  version: 0.1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70344997199800 !ruby/object:Gem::Requirement
+  requirement: &70148296624980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70344997199800
+  version_requirements: *70148296624980
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70344997199380 !ruby/object:Gem::Requirement
+  requirement: &70148296623440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344997199380
+  version_requirements: *70148296623440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70344997198960 !ruby/object:Gem::Requirement
+  requirement: &70148296622320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997198960
+  version_requirements: *70148296622320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70344997198540 !ruby/object:Gem::Requirement
+  requirement: &70148296619140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997198540
+  version_requirements: *70148296619140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70344997198120 !ruby/object:Gem::Requirement
+  requirement: &70148296617420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997198120
+  version_requirements: *70148296617420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70344997197700 !ruby/object:Gem::Requirement
+  requirement: &70148296616720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997197700
+  version_requirements: *70148296616720
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70344997197280 !ruby/object:Gem::Requirement
+  requirement: &70148296615940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997197280
+  version_requirements: *70148296615940
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70344997196860 !ruby/object:Gem::Requirement
+  requirement: &70148296615000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997196860
+  version_requirements: *70148296615000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70344997196440 !ruby/object:Gem::Requirement
+  requirement: &70148296613140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997196440
+  version_requirements: *70148296613140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70344997196020 !ruby/object:Gem::Requirement
+  requirement: &70148296612020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997196020
+  version_requirements: *70148296612020
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70344997224000 !ruby/object:Gem::Requirement
+  requirement: &70148296610520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997224000
+  version_requirements: *70148296610520
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70344997223580 !ruby/object:Gem::Requirement
+  requirement: &70148296608440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997223580
+  version_requirements: *70148296608440
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70344997223160 !ruby/object:Gem::Requirement
+  requirement: &70148296607360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,7 +156,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344997223160
+  version_requirements: *70148296607360
 description: Spinach is a BDD framework on top of gherkin
 email:
 - info@codegram.com
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Spinach is a BDD framework on top of gherkin
@@ -308,3 +308,4 @@ test_files:
 - test/spinach/support_test.rb
 - test/spinach_test.rb
 - test/test_helper.rb
+has_rdoc: