cucumber-rails 1.2.1 → 1.3.0

data/History.md

@@ -1,3 +1,13 @@
+## [v1.3.0](https://github.com/cucumber/cucumber-rails/compare/v1.2.1...v1.3.0)
+
+### New Features
+
+* JavaScript database strategies should take options ([#192](https://github.com/cucumber/cucumber-rails/issues/192), [#195](https://github.com/cucumber/cucumber-rails/pull/195) Thomas Walpole)
+
+### Changed features
+
+* select_date arguments should be reversed ([#190](https://github.com/cucumber/cucumber-rails/issues/190), [#191](https://github.com/cucumber/cucumber-rails/pull/191) Gavin Hughes)
+
 ## [v1.2.1](https://github.com/cucumber/cucumber-rails/compare/v1.2.0...v1.2.1)
 
 ### New features

data/README.md

@@ -1,6 +1,7 @@
 # Cucumber-Rails
 
 [![Build Status](https://secure.travis-ci.org/cucumber/cucumber-rails.png)](http://travis-ci.org/cucumber/cucumber-rails)
+[![Dependency Status](https://gemnasium.com/cucumber/cucumber-rails.png)](https://gemnasium.com/cucumber/cucumber-rails)
 
 Cucumber-Rails brings Cucumber to Rails 3.x. For Rails 2x support, see the [Cucumber Wiki](https://github.com/cucumber/cucumber/wiki/Ruby-on-Rails). 
 

data/cucumber-rails.gemspec

@@ -3,39 +3,39 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.2.1'
+  s.version     = '1.3.0'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generator and Runtime for Rails"
   s.summary     = "#{s.name}-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = "http://cukes.info"
 
-  s.add_runtime_dependency('cucumber', '>= 1.1.3')
+  s.add_runtime_dependency('cucumber', '>= 1.1.8')
   s.add_runtime_dependency('nokogiri', '>= 1.5.0')
   s.add_runtime_dependency('capybara', '>= 1.1.2')
-  s.add_development_dependency('rails', '>= 3.1.3')
+  s.add_development_dependency('rails', '>= 3.2.1')
   s.add_development_dependency('rake', '>= 0.9.2.2')
-  s.add_development_dependency('bundler', '>= 1.0.21')
-  s.add_development_dependency('aruba', '>= 0.4.7')
+  s.add_development_dependency('bundler', '>= 1.0.22')
+  s.add_development_dependency('aruba', '>= 0.4.11')
   s.add_development_dependency('sqlite3', '>= 1.3.5')
-  s.add_development_dependency('rspec', '>= 2.7.0')
-  s.add_development_dependency('rspec-rails', '>= 2.7.0')
-  s.add_development_dependency('ammeter', '>= 0.2.1')
-  s.add_development_dependency('factory_girl', '>= 2.3.2')
-  s.add_development_dependency('database_cleaner', '>= 0.7.0')
-  s.add_development_dependency('mongoid', '>= 2.3.4')
-  s.add_development_dependency('bson_ext', '>= 1.5.1')
+  s.add_development_dependency('rspec', '~> 2.7.0') # Bump when cucumber bumps it
+  s.add_development_dependency('rspec-rails', '~> 2.7.0')
+  s.add_development_dependency('ammeter', '>= 0.2.2')
+  s.add_development_dependency('factory_girl', '>= 2.6.0')
+  s.add_development_dependency('database_cleaner', '>= 0.7.1')
+  s.add_development_dependency('mongoid', '>= 2.4.4')
+  s.add_development_dependency('bson_ext', '>= 1.5.2')
 
   # Various Stuff that Rails 3.1 puts inside apps.
-  s.add_development_dependency('turn', '>= 0.8.3')
-  s.add_development_dependency('sass-rails', '>= 3.1.5')
-  s.add_development_dependency('coffee-rails', '>= 3.1.1')
-  s.add_development_dependency('uglifier', '>= 1.1.0')
-  s.add_development_dependency('jquery-rails', '>= 1.0.19')
+  s.add_development_dependency('turn', '>= 0.9.3')
+  s.add_development_dependency('sass-rails', '>= 3.2.4')
+  s.add_development_dependency('coffee-rails', '>= 3.2.2')
+  s.add_development_dependency('uglifier', '>= 1.2.3')
+  s.add_development_dependency('jquery-rails', '>= 2.0.0')
 
   # For Documentation:
-  s.add_development_dependency('yard', '~> 0.7.4')
-  s.add_development_dependency('rdoc', '~> 3.11')
+  s.add_development_dependency('yard', '~> 0.7.5')
+  s.add_development_dependency('rdoc', '~> 3.12')
   s.add_development_dependency('rdiscount', '~> 1.6.8')
   s.add_development_dependency('bcat', '~> 0.6.2')
 

data/features/capybara_javascript_drivers.feature

@@ -1,3 +1,4 @@
+@focus
 Feature: Capybara Javascript Drivers
 
   Background: A simple calendar app
@@ -6,15 +7,15 @@ Feature: Capybara Javascript Drivers
     And I write to "features/step_definitions/date_time_steps.rb" with:
       """
       When /^(?:|I )select "([^"]+)" as the "([^"]+)" time$/ do |time, selector|
-        select_time(selector, :with => time)
+        select_time(time, :from => selector)
       end
       
       When /^(?:|I )select "([^"]+)" as the "([^"]+)" date$/ do |date, selector|
-        select_date(selector, :with => date)
+        select_date(date, :from => selector)
       end
       
       When /^(?:|I )select "([^"]+)" as the "([^"]+)" date and time$/ do |datetime, selector|
-        select_datetime(selector, :with => datetime)
+        select_datetime(datetime, :from => selector)
       end
       """
 

data/features/choose_javascript_database_strategy.feature

@@ -100,3 +100,36 @@ Feature: Choose javascript database strategy
        2 scenarios (2 passed)
        5 steps (5 passed)
      """
+  Scenario: Set the strategy to truncation with an except option and run a javascript scenario.
+    Given I append to "features/env.rb" with:
+      """
+      Cucumber::Rails::Database.javascript_strategy = :truncation, {:except=>%w[widgets]} 
+      """
+    And I write to "features/widgets.feature" with:
+      """
+      @javascript
+      Feature:
+        Scenario:
+          When I create 3 widgets
+          Then I should have 3 widgets
+
+        Scenario:
+          Then I should have 3 widgets
+      """
+    And I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      Given /created? (\d) widgets/ do |num|
+        num.to_i.times { Widget.create! }
+      end
+
+      Then /should have (\d) widgets/ do |num|
+        Widget.count.should == num.to_i
+      end
+      """
+    When I run the cukes
+    Then it should pass with:
+       """
+       2 scenarios (2 passed)
+       3 steps (3 passed)
+       """
+

data/features/no_database.feature

@@ -1,8 +1,9 @@
+@announce
 Feature: No Database
   Allow Cucumber to work with a Rails app without a database
 
   Scenario: No ActiveRecord and DatabaseCleaner
-    Given I have created a new Rails 3 app "rails-3-app" and installed cucumber-rails
+    Given I have created a new Rails 3 app with no database and installed cucumber-rails
     # Turn off ActiveRecord
     And I write to "config/application.rb" with:
       """
@@ -15,14 +16,13 @@ Feature: No Database
 
       Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-      module Rails3App
+      module TestApp
         class Application < Rails::Application
           config.encoding = "utf-8"
           config.filter_parameters += [:password]
         end
       end
       """
-    And I remove the file "config/database.yml"
     And I overwrite "features/support/env.rb" with:
       """
       require 'cucumber/rails'
@@ -46,7 +46,7 @@ Feature: No Database
       """
     And I write to "config/routes.rb" with:
       """
-      Rails3App::Application.routes.draw do
+      TestApp::Application.routes.draw do
         resources :posts
       end
       """

data/lib/cucumber/rails/capybara/select_dates_and_times.rb

@@ -3,32 +3,29 @@ module Cucumber
     module Capybara
       # This module defines methods for selecting dates and times
       module SelectDatesAndTimes
-        # Select a Rails date with label +field+
-        # The +options+ hash should contain a Date parseable date (as a string) 
-        def select_date(field, options)
-          date        = Date.parse(options[:with])
-          base_dom_id = get_base_dom_id_from_label_tag(field)
+        # Select a Rails date. Options has must include :from => +label+
+        def select_date(date, options)
+          date        = Date.parse(date)
+          base_dom_id = get_base_dom_id_from_label_tag(options[:from])
 
           find(:xpath, ".//select[@id='#{base_dom_id}_1i']").select(date.year.to_s)
           find(:xpath, ".//select[@id='#{base_dom_id}_2i']").select(I18n.l date, :format => '%B')
           find(:xpath, ".//select[@id='#{base_dom_id}_3i']").select(date.day.to_s)
         end
       
-        # Select a Rails time with label +field+
-        # The +options+ hash should contain a Time parseable time (as a string) 
-        def select_time(field, options)
-          time        = Time.zone.parse(options[:with])
-          base_dom_id = get_base_dom_id_from_label_tag(field)
+        # Select a Rails time. Options has must include :from => +label+
+        def select_time(time, options)
+          time        = Time.zone.parse(time)
+          base_dom_id = get_base_dom_id_from_label_tag(options[:from])
 
           find(:xpath, ".//select[@id='#{base_dom_id}_4i']").select(time.hour.to_s.rjust(2, '0'))
           find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2,  '0'))
         end
       
-        # Select a Rails date and time with label +field+
-        # The +options+ hash should contain a Date/Time parseable time (as a string) 
-        def select_datetime(field, options)
-          select_date(field, options)
-          select_time(field, options)
+        # Select a Rails datetime. Options has must include :from => +label+
+        def select_datetime(datetime, options)
+          select_date(datetime, options)
+          select_time(datetime, options)
         end
 
         private

data/lib/cucumber/rails/database.rb

@@ -8,7 +8,8 @@ module Cucumber
 
       class << self
 
-        def javascript_strategy=(strategy)
+        def javascript_strategy=(args)
+          strategy, *strategy_opts = args
           strategy_type =
             case strategy
             when Symbol
@@ -16,8 +17,8 @@ module Cucumber
             when Class
               strategy
             end
-
-          @strategy = strategy_type.new
+            
+          @strategy =  strategy_type.new(*strategy_opts)
 
           validate_interface!
         end
@@ -70,9 +71,13 @@ module Cucumber
       end
 
       class Strategy
+        def initialize(options={})
+          @options=options
+        end
+        
         def before_js(strategy)
           @original_strategy = DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
-          DatabaseCleaner.strategy = strategy
+          DatabaseCleaner.strategy = strategy, @options
         end
 
         def before_non_js

data/lib/generators/cucumber/install/templates/support/_rails_each_run.rb.erb

@@ -27,7 +27,10 @@ end
 # See the DatabaseCleaner documentation for details. Example:
 #
 #   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
-#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+#     # { :except => [:widgets] } may not do what you expect here
+#     # as tCucumber::Rails::Database.javascript_strategy overrides
+#     # this setting.
+#     DatabaseCleaner.strategy = :truncation
 #   end
 #
 #   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153136380 !ruby/object:Gem::Requirement
+  requirement: &2168737460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153136380
+  version_requirements: *2168737460
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153135740 !ruby/object:Gem::Requirement
+  requirement: &2168736980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153135740
+  version_requirements: *2168736980
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153135020 !ruby/object:Gem::Requirement
+  requirement: &2168736520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,21 +45,21 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153135020
+  version_requirements: *2168736520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153133620 !ruby/object:Gem::Requirement
+  requirement: &2168752420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.1
   type: :development
   prerelease: false
-  version_requirements: *2153133620
+  version_requirements: *2168752420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153133160 !ruby/object:Gem::Requirement
+  requirement: &2168751960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,32 +67,32 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2153133160
+  version_requirements: *2168751960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153132680 !ruby/object:Gem::Requirement
+  requirement: &2168751500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: 1.0.22
   type: :development
   prerelease: false
-  version_requirements: *2153132680
+  version_requirements: *2168751500
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2153132000 !ruby/object:Gem::Requirement
+  requirement: &2168751040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *2153132000
+  version_requirements: *2168751040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153131280 !ruby/object:Gem::Requirement
+  requirement: &2168750580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,164 +100,164 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *2153131280
+  version_requirements: *2168750580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153130560 !ruby/object:Gem::Requirement
+  requirement: &2168750120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153130560
+  version_requirements: *2168750120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153130060 !ruby/object:Gem::Requirement
+  requirement: &2168749660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153130060
+  version_requirements: *2168749660
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &2153129440 !ruby/object:Gem::Requirement
+  requirement: &2168749200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *2153129440
+  version_requirements: *2168749200
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2153128480 !ruby/object:Gem::Requirement
+  requirement: &2168748740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153128480
+  version_requirements: *2168748740
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2153117380 !ruby/object:Gem::Requirement
+  requirement: &2168748280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *2153117380
+  version_requirements: *2168748280
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153116500 !ruby/object:Gem::Requirement
+  requirement: &2168747820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.4.4
   type: :development
   prerelease: false
-  version_requirements: *2153116500
+  version_requirements: *2168747820
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153115340 !ruby/object:Gem::Requirement
+  requirement: &2168747360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2153115340
+  version_requirements: *2168747360
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2153113540 !ruby/object:Gem::Requirement
+  requirement: &2168746900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.3
   type: :development
   prerelease: false
-  version_requirements: *2153113540
+  version_requirements: *2168746900
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2153112700 !ruby/object:Gem::Requirement
+  requirement: &2168746440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 3.2.4
   type: :development
   prerelease: false
-  version_requirements: *2153112700
+  version_requirements: *2168746440
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2153112120 !ruby/object:Gem::Requirement
+  requirement: &2168745980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *2153112120
+  version_requirements: *2168745980
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2153111480 !ruby/object:Gem::Requirement
+  requirement: &2168745520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.3
   type: :development
   prerelease: false
-  version_requirements: *2153111480
+  version_requirements: *2168745520
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153110640 !ruby/object:Gem::Requirement
+  requirement: &2168745060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153110640
+  version_requirements: *2168745060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153109940 !ruby/object:Gem::Requirement
+  requirement: &2168760960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2153109940
+  version_requirements: *2168760960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153109400 !ruby/object:Gem::Requirement
+  requirement: &2168760500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2153109400
+  version_requirements: *2168760500
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153108940 !ruby/object:Gem::Requirement
+  requirement: &2168760040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -265,10 +265,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2153108940
+  version_requirements: *2168760040
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2153108360 !ruby/object:Gem::Requirement
+  requirement: &2168759580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -276,7 +276,7 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2153108360
+  version_requirements: *2168759580
 description: Cucumber Generator and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -373,7 +373,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: cucumber-rails-1.2.1
+summary: cucumber-rails-1.3.0
 test_files:
 - features/allow_rescue.feature
 - features/capybara_javascript_drivers.feature