cucumber-rails 0.5.0 → 0.5.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.5.1 2011-05-25
+
+=== Bugfixes
+* Mixed DB access feature for @javascript drivers (#142 Alexander Mankuta)
+* cucumber:feature and integers. not creating feature correctly (#30 John Ivanoff, Aslak Hellesøy)
+* New project can't find capybara's "visit" (#143 Aslak Hellesøy)
+* rails generate cucumber:install attempts double run (#140 Aslak Hellesøy)
+
 == 0.5.0 2011-05-17
 
 === Bugfixes

data/cucumber-rails.gemspec

@@ -3,17 +3,18 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generators and Runtime for Rails"
   s.summary     = "#{s.name}-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = "http://cukes.info"
 
-  s.add_dependency('cucumber', '>= 0.10.2')
+  s.add_dependency('cucumber', '>= 0.10.3')
   s.add_dependency('rack-test', '>= 0.5.7')
   s.add_dependency('nokogiri', '>= 1.4.4')
   s.add_dependency('capybara', '>= 1.0.0.beta1')
+  s.add_development_dependency('rake', '= 0.8.7') # Until Rails 3 supports rake 0.9.0. Rakefile needs TheApp::Application.send(:include, Rake::DSL)
   s.add_development_dependency('bundler', '>= 1.0.13')
   s.add_development_dependency('aruba', '>= 0.3.6')
   s.add_development_dependency('rails', '>= 3.0.7')
@@ -22,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec-rails', '>= 2.6.0')
   s.add_development_dependency('factory_girl', '>= 2.0.0.beta2')
   s.add_development_dependency('database_cleaner', '>= 0.6.7')
-  s.add_development_dependency('mongoid', '>= 2.0.1')
+  s.add_development_dependency('mongoid', '>= 2.0.2')
   s.add_development_dependency('bson_ext', '>= 1.3.0')
   # s.add_development_dependency('akephalos', '>= 0.2.5')
 

data/features/capybara_javascript_drivers.feature

@@ -1,10 +1,11 @@
-@broken
 Feature: Capybara Javascript Drivers
 
   Background: A simple calendar app
     Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
     And I successfully run `bundle exec rails g scaffold appointment name:string when:datetime`
-    And I write to "features/create_appointment.feature" with:
+
+  Scenario Outline: Use a particular driver
+    Given I write to "features/create_appointment.feature" with:
       """
       @javascript
       Feature: Create appointments
@@ -17,9 +18,7 @@ Feature: Capybara Javascript Drivers
           And I should see "2009-02-20 15:10:00 UTC"
 
       """
-  
-  Scenario Outline: Use a particular driver
-    Given I append to "Gemfile" with:
+    And I append to "Gemfile" with:
       """
       <Gemfile extra>
 
@@ -36,8 +35,51 @@ Feature: Capybara Javascript Drivers
       1 scenario (1 passed)
       6 steps (6 passed)
       """
-      
+
+    Examples:
+      | Gemfile extra                    | env.rb extra       |
+      | gem "capybara", :group => :test  | require 'capybara' |
+
+  Scenario Outline: Mixed DB access
+    Given I write to "features/create_appointment.feature" with:
+      """
+      @javascript
+      Feature: Create appointments
+        Scenario: Constitution on May 17
+          Given a random appointment
+          And I am viewing random appointment
+          Then I should see "Random appointment"
+
+      """
+    And I write to "features/step_definitions/custom_steps.rb" with:
+      """
+      Given /^a random appointment$/ do
+        @appointment = Appointment.create!(:name => 'Random appointment', :when => DateTime.now)
+      end
+
+      Given /^I am viewing random appointment$/ do
+        visit appointment_path(@appointment)
+      end
+      """
+    And I append to "Gemfile" with:
+      """
+      <Gemfile extra>
+
+      """
+    And I append to "features/support/env.rb" with:
+      """
+      <env.rb extra>
+
+      """
+
+    When I run `bundle exec rake db:migrate cucumber`
+    Then it should pass with:
+      """
+      1 scenario (1 passed)
+      3 steps (3 passed)
+      """
+
     Examples:
-      | Gemfile extra                    | env.rb extra                                                  |
-      | gem "akephalos", :group => :test | require 'akephalos' ; Capybara.javascript_driver = :akephalos |
-    
+      | Gemfile extra                    | env.rb extra       |
+      | gem "capybara", :group => :test  | require 'capybara' |
+

data/features/emulate_javascript.feature

@@ -1,16 +1,16 @@
 Feature: Emulate Javascript
 
-  Scenario: Delete a widget
+  Scenario: See a widget
     Given I have created a new Rails 3 app "widgets" with cucumber-rails support
     And I successfully run `rails generate scaffold widget name:string`
     And I write to "features/f.feature" with:
       """
+      @javascript
       Feature: Widget inventory
         Scenario: Delete a widget
           Given there is a widget named "wrench"
           When I go to the widgets page
-          And I follow "Destroy"
-          Then I should not see "wrench"
+          Then I should see "wrench"
       """
     And I write to "features/step_definitions/s.rb" with:
       """
@@ -28,6 +28,6 @@ Feature: Emulate Javascript
     Then it should pass with:
        """
        1 scenario (1 passed)
-       4 steps (4 passed)
+       3 steps (3 passed)
        """
 

data/features/inspect_query_string.feature

@@ -2,9 +2,9 @@ Feature: Inspect query string
 
   Scenario: Inspect query string
     Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
-    And I successfully run `rails generate cucumber:feature post title:string body:text published:boolean`
-    And I successfully run `rails generate scaffold post title:string body:text published:boolean`
-    And I successfully run `rails generate scaffold cukes name:string`
+    And I successfully run `rails generate cucumber:feature post title:string body:text number:integer published:boolean`
+    And I successfully run `rails generate scaffold post title:string body:text number:integer published:boolean`
+    And I successfully run `rails generate scaffold cuke name:string`
     And I overwrite "app/controllers/cukes_controller.rb" with:
       """
       class CukesController < ApplicationController
@@ -31,6 +31,6 @@ Feature: Inspect query string
     Then it should pass with:
        """
        3 scenarios (3 passed)
-       14 steps (14 passed)
+       16 steps (16 passed)
        """
 

data/features/support/env.rb

@@ -5,6 +5,6 @@ require 'rspec/expectations'
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 60 # A long time needed some times to install gems (bundle install)
+  @aruba_timeout_seconds = 120 # A long time needed some times
   unset_bundler_env_vars
 end

data/lib/cucumber/rails/capybara.rb

@@ -1,7 +1,6 @@
-if defined?(Capybara)
-  require 'capybara/rails'
-  require 'capybara/cucumber'
-  require 'capybara/session'
-  require 'cucumber/rails/capybara/javascript_emulation'
-  require 'cucumber/rails/capybara/select_dates_and_times'
-end
+require 'capybara'
+require 'capybara/rails'
+require 'capybara/cucumber'
+require 'capybara/session'
+require 'cucumber/rails/capybara/javascript_emulation'
+require 'cucumber/rails/capybara/select_dates_and_times'

data/lib/cucumber/rails/hooks.rb

@@ -1,3 +1,4 @@
+require 'cucumber/rails/hooks/active_record'
 require 'cucumber/rails/hooks/database_cleaner'
 require 'cucumber/rails/hooks/allow_rescue'
 require 'cucumber/rails/hooks/mail'

data/lib/cucumber/rails/hooks/active_record.rb

@@ -0,0 +1,14 @@
+if defined?(ActiveRecord::Base)
+  require 'cucumber/rails3/active_record'
+
+  Before('@javascript') do
+    # Forces all threads to share the same connection. This works on
+    # Capybara because it starts the web server in a thread.
+    ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+  end
+
+  Before('~@javascript') do
+    # Do not use a shared connection unless we're in a @javascript scenario
+    ActiveRecord::Base.shared_connection = nil
+  end
+end

data/lib/cucumber/rails3/active_record.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end

data/lib/generators/cucumber/feature/named_arg.rb

@@ -9,6 +9,8 @@ class NamedArg
   def value(n)
     if @type == 'boolean'
       (n % 2) == 0
+    elsif @type == 'integer'
+      n
     else
       "#{@name} #{n}"
     end

data/lib/generators/cucumber/install/USAGE

@@ -7,9 +7,9 @@ Description:
     Also see the cucumber:feature generator.
     
 Examples:
-    `script/rails generate cucumber:install`
+    `rails generate cucumber:install`
 
-    `script/rails generate cucumber:install --help`
+    `rails generate cucumber:install --help`
 
-    You can also provide a language argument for localized webrat_steps:
-    `script/rails generate cucumber:install de`
+    You can also provide a language argument for localized web_steps:
+    `rails generate cucumber:install de`

data/lib/generators/cucumber/install/install_generator.rb

@@ -15,15 +15,6 @@ module Cucumber
 
     attr_reader :framework
 
-    def generate
-      create_templates
-      create_scripts
-      create_step_definitions
-      create_feature_support
-      create_tasks
-      create_database unless options[:skip_database]
-    end
-
     def create_templates
       template 'config/cucumber.yml.erb', 'config/cucumber.yml'
     end

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

@@ -27,7 +27,7 @@ end
 # See the DatabaseCleaner documentation for details. Example:
 #
 #   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
-#     DatabaseCleaner.strategy = :truncation, :except => %w[widgets]
+#     DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
 #   end
 #
 #   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do

data/lib/generators/cucumber/install/templates/support/capybara.rb

@@ -1,4 +1,3 @@
-require 'capybara'
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your

metadata

@@ -2,7 +2,7 @@
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 +01:00
+date: 2011-05-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -60,62 +60,62 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.13
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: bundler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.6
+        version: 1.0.13
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: aruba
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.7
+        version: 0.3.6
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rails
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sqlite3-ruby
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,49 +126,60 @@ dependencies:
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
+  name: rspec-rails
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.beta2
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: factory_girl
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.7
+        version: 2.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: database_cleaner
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 0.6.7
   type: :development
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongoid
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id015
 description: Cucumber Generators and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -215,6 +226,7 @@ files:
 - lib/cucumber/rails/capybara/javascript_emulation.rb
 - lib/cucumber/rails/capybara/select_dates_and_times.rb
 - lib/cucumber/rails/hooks.rb
+- lib/cucumber/rails/hooks/active_record.rb
 - lib/cucumber/rails/hooks/allow_rescue.rb
 - lib/cucumber/rails/hooks/database_cleaner.rb
 - lib/cucumber/rails/hooks/mail.rb
@@ -222,6 +234,7 @@ files:
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rails3.rb
 - lib/cucumber/rails3/action_controller.rb
+- lib/cucumber/rails3/active_record.rb
 - lib/cucumber/rails3/application.rb
 - lib/cucumber/web/tableish.rb
 - lib/generators/cucumber/feature/USAGE
@@ -232,7 +245,6 @@ files:
 - lib/generators/cucumber/install/USAGE
 - lib/generators/cucumber/install/install_generator.rb
 - lib/generators/cucumber/install/templates/config/cucumber.yml.erb
-- lib/generators/cucumber/install/templates/environments/cucumber.rb.erb
 - lib/generators/cucumber/install/templates/script/cucumber
 - lib/generators/cucumber/install/templates/step_definitions/web_steps.rb.erb
 - lib/generators/cucumber/install/templates/step_definitions/web_steps_cs.rb.erb
@@ -269,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3249523460490055111
+      hash: 3273597867549986785
       segments: 
       - 0
       version: "0"
@@ -278,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3249523460490055111
+      hash: 3273597867549986785
       segments: 
       - 0
       version: "0"
@@ -288,7 +300,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cucumber-rails-0.5.0
+summary: cucumber-rails-0.5.1
 test_files: 
 - features/allow_rescue.feature
 - features/capybara_javascript_drivers.feature

data/lib/generators/cucumber/install/templates/environments/cucumber.rb.erb

@@ -1,33 +0,0 @@
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-
-# IMPORTANT: Setting config.cache_classes to false is known to
-# break Cucumber's use_transactional_fixtures method.
-# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
-config.cache_classes = true
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
-
-# Tell Action Mailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
-
-config.gem 'cucumber-rails',   :lib => false, :version => '>=<%= version %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
-config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
-config.gem 'capybara',         :lib => false, :version => '>=0.3.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
-<% if framework == :rspec -%>
-config.gem 'rspec',            :lib => false, :version => '>=1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
-config.gem 'rspec-rails',      :lib => false, :version => '>=1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
-<% end %>
-<% if spork? -%>
-config.gem 'spork',            :lib => false, :version => '>=0.7.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
-<% end %>