cucumber-rails 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.4.1 2011-04-05
+
+=== Bugfixes
+* Fixed incorrect warning in generated files. (#115 Emanuele Vicentini)
+* Fixed incorrect hooks for DatabaseCleaner (#113 Markus Bengts)
+* Throw an error if the user forgot to add DatabaseCleaner to the Gemfile, allowing them to decide whether or not to use it. (#36 Aslak Hellesøy, Ryan Bigg)
+
 == 0.4.0 2011-03-20
 
 === New Features

data/cucumber-rails.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('webrat', Cucumber::Rails::DEPS['webrat'])
   s.add_development_dependency('database_cleaner', Cucumber::Rails::DEPS['database_cleaner'])
   s.add_development_dependency('mongoid', Cucumber::Rails::DEPS['mongoid'])
+  s.add_development_dependency('bson_ext', Cucumber::Rails::DEPS['bson_ext'])
+  s.add_development_dependency('akephalos', Cucumber::Rails::DEPS['akephalos'])
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")

data/features/capybara_javascript_drivers.feature

@@ -0,0 +1,42 @@
+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:
+      """
+      @javascript
+      Feature: Create appointments
+        Scenario: Constitution on May 17
+          Given I am on the new appointment page
+          And I fill in "Norway's constitution" for "Name"
+          And I select "2009-02-20 15:10:00 UTC" as the "When" date and time
+          And I press "Create Appointment"
+          Then I should see "Norway's constitution"
+          And I should see "2009-02-20 15:10:00 UTC"
+
+      """
+  
+  Scenario Outline: Use a particular driver
+    Given 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)
+      6 steps (6 passed)
+      """
+      
+    Examples:
+      | Gemfile extra                    | env.rb extra                                                  |
+      | gem "akephalos", :group => :test | require 'akephalos' ; Capybara.javascript_driver = :akephalos |
+    

data/features/select_dates.feature

@@ -2,10 +2,10 @@ Feature: Select dates
 
   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`
   
-  Scenario: Select dates
-    Given I write to "features/create_appointment.feature" with:
+  Scenario: Select date and time
+    Given I successfully run `bundle exec rails g scaffold appointment name:string when:datetime`
+    And I write to "features/create_appointment.feature" with:
       """
       Feature: Create appointments
         Scenario: Constitution on May 17
@@ -22,4 +22,39 @@ Feature: Select dates
       1 scenario (1 passed)
       6 steps (6 passed)
       """
-    
+  
+  Scenario: Select date with label pointing to first select
+    Given I successfully run `bundle exec rails g scaffold appointment name:string when:date`
+    And I write to "features/create_appointment.feature" with:
+      """
+      Feature: Create appointments
+        Scenario: Constitution on May 17
+          Given I am on the new appointment page
+          And I fill in "Norway's constitution" for "Name"
+          And I select "2009-02-20" as the "When" date
+          And I press "Create Appointment"
+          Then I should see "Norway's constitution"
+          And I should see "2009-02-20"
+      """
+    And I write to "app/views/appointments/_form.html.erb" with:
+      """
+      <%= form_for(@appointment) do |f| %>
+        <div class="field">
+          <%= f.label :name %><br />
+          <%= f.text_field :name %>
+        </div>
+        <div class="field">
+          <%= f.label :when, :for => "appointment_when_1i" %><br />
+          <%= f.date_select :when %>
+        </div>
+        <div class="actions">
+          <%= f.submit %>
+        </div>
+      <% end %>
+      """
+    When I run `bundle exec rake db:migrate cucumber`
+    Then it should pass with:
+      """
+      1 scenario (1 passed)
+      6 steps (6 passed)
+      """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -12,6 +12,7 @@ Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support$
       gem "capybara", :group => :test
       gem "rspec-rails", :group => :test
       gem "database_cleaner", :group => :test
+
       """
     And I successfully run `bundle exec rails generate cucumber:install`
   }
@@ -26,11 +27,13 @@ Given /^a project without ActiveRecord$/ do
       gem "cucumber-rails", :group => :test, :path => "../../.."
       gem "capybara", :group => :test
       gem "rspec-rails", :group => :test
+
       """
     And I successfully run `bundle exec rails generate cucumber:install`
     And I overwrite "features/support/env.rb" with:
       """
       require 'cucumber/rails'
+
       """
 
     And I write to "config/application.rb" with:
@@ -50,6 +53,7 @@ Given /^a project without ActiveRecord$/ do
           config.filter_parameters += [:password]
         end
       end
+
       """
     And I remove the file "config/database.yml"
   }
@@ -62,6 +66,7 @@ And /^a cukes resource$/ do
       CukeApp::Application.routes.draw do
         resources :cukes
       end
+
       """
     And I write to "app/controllers/cukes_controller.rb" with:
       """
@@ -69,6 +74,7 @@ And /^a cukes resource$/ do
         def index
         end
       end
+
       """
   }
 end

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

@@ -28,7 +28,7 @@ module Cucumber
 
         # @example "event_starts_at_"
         def get_base_dom_id_from_label_tag(field)
-          find(:xpath, "//label[contains(., '#{field}')]")['for'].gsub(/(1i)$/, '')
+          find(:xpath, "//label[contains(., '#{field}')]")['for'].gsub(/(_1i)$/, '')
         end
       end
     end

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

@@ -12,11 +12,11 @@ begin
   end
 
   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.strategy = $__cucumber_global_database_cleaner_strategy
   end
 
   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
-    DatabaseCleaner.strategy = $__cucumber_global_database_cleaner_strategy
+    DatabaseCleaner.strategy = :truncation
   end
 
   Before do

data/lib/cucumber/rails/version.rb

@@ -1,6 +1,6 @@
 module Cucumber
   module Rails
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
     DEPS = {
       'aruba'             => '>= 0.3.4',
       'cucumber'          => '>= 0.10.1',
@@ -8,13 +8,15 @@ module Cucumber
       'bundler'           => '>= 1.0.10',
       'rack-test'         => '>= 0.5.7',
       'nokogiri'          => '>= 1.4.4',
-      'rails'             => '>= 3.0.3',
+      'rails'             => '>= 3.0.5',
       'capybara'          => '>= 0.4.1',
       'webrat'            => '>= 0.7.3',
       'rspec-rails'       => '>= 2.2.0',
       'database_cleaner'  => '>= 0.6.0',
       'sqlite3-ruby'      => '>= 1.3.3',
-      'mongoid'           => '>= 2.0.0.rc.7'
+      'mongoid'           => '>= 2.0.0',
+      'bson_ext'          => '>= 1.3.0',
+      'akephalos'         => '>= 0.2.5'
     }
   end
 end

data/templates/install/step_definitions/capybara_steps.rb.erb

@@ -1,4 +1,4 @@
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require 'uri'
 require 'cgi'

data/templates/install/step_definitions/web_steps_cs.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_da.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_de.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 

data/templates/install/step_definitions/web_steps_es.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_ja.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_ko.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_no.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/web_steps_pt-BR.rb.erb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))

data/templates/install/step_definitions/webrat_steps.rb.erb

@@ -1,4 +1,4 @@
-<%= embed_file('support/edit_warning.txt') %>
+<%= embed_file('support/web_steps_warning.txt') %>
 
 require 'uri'
 require 'cgi'
@@ -144,7 +144,7 @@ Then /^(?:|I )should see "([^"]*)"$/ do |text|
   end
 end
 
-Then /^(?:|I )should see "([^"]*)" within "([^"]*)"$/ do |text, parent|
+Then /^(?:|I )should see "([^"]*)" within (.*)$/ do |text, parent|
   within(selector_for(parent)) do |content|
     if content.respond_to? :should
       content.should contain(text)

data/templates/install/support/_rails_each_run.rb.erb

@@ -15,6 +15,10 @@
 #
 ActionController::Base.allow_rescue = false
 
-# Remove this line if your app doesn't have a database.
+# Remove/comment out the lines below if your app doesn't have a database.
 # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
-DatabaseCleaner.strategy = :transaction
+begin
+  DatabaseCleaner.strategy = :transaction
+rescue NameError
+  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+end

data/templates/install/support/edit_warning.txt

@@ -1,19 +1,5 @@
-# TL;DR: YOU SHOULD DELETE THIS FILE
-#
-# This file iwas generated by Cucumber-Rails and is only here to get you a head start
-# These step definitions are thin wrappers around the Capybara/Webrat API that lets you
-# visit pages, interact with widgets and make assertions about page content.
-#
-# If you use these step definitions as basis for your features you will quickly end up
-# with features that are:
-#
-# * Hard to maintain
-# * Verbose to read
-#
-# A much better approach is to write your own higher level step definitions, following
-# the advice in the following blog posts:
-#
-# * http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
-# * http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
-# * http://elabs.se/blog/15-you-re-cuking-it-wrong 
-#
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.

data/templates/install/support/selectors.rb

@@ -16,7 +16,7 @@ module HtmlSelectorsHelpers
     #
     #  when /the (notice|error|info) flash/
     #    ".flash.#{$1}"
-    
+
     # You can also return an array to use a different selector
     # type, like:
     #
@@ -36,4 +36,4 @@ module HtmlSelectorsHelpers
   end
 end
 
-World(HtmlSelectorsHelpers)
+World(HtmlSelectorsHelpers)

data/templates/install/support/web_steps_warning.txt

@@ -0,0 +1,19 @@
+# TL;DR: YOU SHOULD DELETE THIS FILE
+#
+# This file was generated by Cucumber-Rails and is only here to get you a head start
+# These step definitions are thin wrappers around the Capybara/Webrat API that lets you
+# visit pages, interact with widgets and make assertions about page content.
+#
+# If you use these step definitions as basis for your features you will quickly end up
+# with features that are:
+#
+# * Hard to maintain
+# * Verbose to read
+#
+# A much better approach is to write your own higher level step definitions, following
+# the advice in the following blog posts:
+#
+# * http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
+# * http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
+# * http://elabs.se/blog/15-you-re-cuking-it-wrong
+#

metadata

@@ -2,7 +2,7 @@
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +00:00
+date: 2011-04-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.3
+        version: 3.0.5
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -143,10 +143,32 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.rc.7
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: akephalos
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.5
+  type: :development
+  prerelease: false
+  version_requirements: *id014
 description: Cucumber Generators and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -173,6 +195,7 @@ files:
 - dev_tasks/cucumber.rake
 - dev_tasks/rspec.rake
 - features/allow_rescue.feature
+- features/capybara_javascript_drivers.feature
 - features/inspect_query_string.feature
 - features/install_cucumber_rails.feature
 - features/mongoid.feature
@@ -237,6 +260,7 @@ files:
 - templates/install/support/rails.rb.erb
 - templates/install/support/rails_spork.rb.erb
 - templates/install/support/selectors.rb
+- templates/install/support/web_steps_warning.txt
 - templates/install/support/webrat.rb
 - templates/install/tasks/cucumber.rake.erb
 has_rdoc: true
@@ -253,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -74222375310759087
+      hash: 1785260491327493469
       segments: 
       - 0
       version: "0"
@@ -262,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -74222375310759087
+      hash: 1785260491327493469
       segments: 
       - 0
       version: "0"
@@ -272,9 +296,10 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cucumber-rails-0.4.0
+summary: cucumber-rails-0.4.1
 test_files: 
 - features/allow_rescue.feature
+- features/capybara_javascript_drivers.feature
 - features/inspect_query_string.feature
 - features/install_cucumber_rails.feature
 - features/mongoid.feature