cucumber-rails 0.1.1.rc6 → 0.2.0

data/History.txt

@@ -1,4 +1,30 @@
-== In Git
+== 0.2.0
+
+This is the first release of cucumber-rails, which was factored out of cucumber.
+We're calling it 0.2.0 just because we did some prereleases in the 0.1 series,
+and to celebrate that cucumber-rails now supports Capybara as an alternative to Webrat.
+
+=== UPGRADING FROM A PREVIOUS CUCUMBER SETUP
+
+1) Remove your features/support/version_check.rb
+2) Remove your features/step_definitions/webrat_steps.rb
+   If you have added your own custom step definitions to this file,
+   put them in a different file under features/step_definitions
+3) run "ruby script/generate cucumber --help" to see what options you have.
+4) run "ruby script/generate cucumber" - plus whatever options you think fit for you.
+   Answer "n" (no) when asked to overwrite paths.rb.
+   Answer "y" (yes) when asked to overwrite other files, but do "d" (diff) first.
+   If you have edits in some of these files that you want to keep, store the diff
+   in a temporary file and reapply after you have overwritten the file. ALso consider
+   adding your custom code to another file that won't be overwritten the next time
+   you upgrade.
+   
+   Many people have edits in their env.rb file. This is something you should try
+   to avoid in the future. Instead, keep your custom setup in a different file
+   under features/support - Cucumber loads all files under features/**/*.rb anyway.
+   
+   If you have a Spork setup, see the end of this thread:
+   http://groups.google.com/group/cukes/browse_thread/thread/475385cc26377215
 
 === New features
 * Added an @emulate_rails_javascript tag that will emulate onclick with Capybara (Aslak Hellesøy, Rob Holland)

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.authors = ["Dennis Blöte", "Aslak Hellesøy", "Rob Holland"]
     gemspec.homepage = "http://github.com/dbloete/cucumber-rails"
 
-    gemspec.add_dependency 'cucumber', '>= 0.4.5.rc2'
+    gemspec.add_dependency 'cucumber', '>= 0.5.0'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.1.rc6
+0.2.0

data/cucumber-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber-rails}
-  s.version = "0.1.1.rc6"
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Bl\303\266te", "Aslak Helles\303\270y", "Rob Holland"]
-  s.date = %q{2009-12-09}
+  s.date = %q{2009-12-15}
   s.description = %q{Cucumber Generators and Runtime for Rails}
   s.email = %q{cukes@googlegroups.com}
   s.extra_rdoc_files = [
@@ -71,12 +71,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.4.5.rc2"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.5.0"])
     else
-      s.add_dependency(%q<cucumber>, [">= 0.4.5.rc2"])
+      s.add_dependency(%q<cucumber>, [">= 0.5.0"])
     end
   else
-    s.add_dependency(%q<cucumber>, [">= 0.4.5.rc2"])
+    s.add_dependency(%q<cucumber>, [">= 0.5.0"])
   end
 end
 

data/generators/cucumber/cucumber_generator.rb

@@ -17,6 +17,17 @@ class CucumberGenerator < Rails::Generator::Base
   
   def manifest
     record do |m|
+      if File.exist?('features/step_definitions/webrat_steps.rb')
+        STDERR.puts "Please remove features/step_definitions/webrat_steps.rb\n" + 
+        "See upgrading instructions for 0.2.0 in History.txt"
+        exit(1)
+      end
+      if File.exist?('features/support/version_check.rb')
+        STDERR.puts "Please remove features/support/version_check\n" + 
+        "See upgrading instructions for 0.2.0 in History.txt"
+        exit(1)
+      end
+
       m.template 'config/cucumber.yml.erb', 'config/cucumber.yml'
 
       m.template 'environments/cucumber.rb.erb', 'config/environments/cucumber.rb'
@@ -70,6 +81,10 @@ class CucumberGenerator < Rails::Generator::Base
     ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
   end
 
+  def version
+    IO.read(File.dirname(__FILE__) + '/../../VERSION').chomp
+  end
+
 private
 
   def first_loadable(libraries)

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

@@ -21,11 +21,11 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem 'cucumber',         :lib => false, :version => '>=<%= Cucumber::VERSION %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
+config.gem 'cucumber-rails',   :lib => false, :version => '>=<%= version %>' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
 <% if driver == :capybara -%>
-config.gem 'capybara',         :lib => false, :version => '>=0.1.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
+config.gem 'capybara',         :lib => false, :version => '>=0.2.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
 <% else -%>
-config.gem 'webrat',           :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
+config.gem 'webrat',           :lib => false, :version => '>=0.6.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
 <% end -%>
 <% if framework == :rspec -%>
 config.gem 'rspec',            :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
@@ -34,5 +34,5 @@ config.gem 'rspec-rails',      :lib => false, :version => '>=1.2.9' unless File.
 config.gem 'database_cleaner', :lib => false, :version => '>=0.2.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
 <% end %>
 <% if spork? -%>
-config.gem 'spork',            :lib => false, :version => '>=0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
+config.gem 'spork',            :lib => false, :version => '>=0.7.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/spork'))
 <% end %>

data/generators/cucumber/templates/step_definitions/capybara_steps.rb.erb

@@ -66,65 +66,6 @@ When /^(?:|I )select "([^\"]*)" from "([^\"]*)"(?: within "([^\"]*)")?$/ do |val
   end
 end
 
-# Use this step in conjunction with Rail's datetime_select helper. For example:
-# When I select "December 25, 2008 10:00" as the date and time
-When /^(?:|I )select "([^\"]*)" as the date and time(?: within "([^\"]*)")?$/ do |time, selector|
-  with_scope(selector) do
-    select_datetime(time)
-  end
-end
-
-# Use this step when using multiple datetime_select helpers on a page or
-# you want to specify which datetime to select. Given the following view:
-#   <%%= f.label :preferred %><br />
-#   <%%= f.datetime_select :preferred %>
-#   <%%= f.label :alternative %><br />
-#   <%%= f.datetime_select :alternative %>
-# The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" date and time
-# And I select "November 25, 2004 10:30" as the "Alternative" date and time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date and time(?: within "([^\"]*)")?$/ do |datetime, datetime_label, selector|
-  with_scope(selector) do
-    select_datetime(datetime, :from => datetime_label)
-  end
-end
-
-# Use this step in conjunction with Rail's time_select helper. For example:
-# When I select "2:20PM" as the time
-# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it.
-When /^(?:|I )select "([^\"]*)" as the time(?: within "([^\"]*)")?$/ do |time, selector|
-  with_scope(selector) do
-    select_time(time)
-  end
-end
-
-# Use this step when using multiple time_select helpers on a page or you want to
-# specify the name of the time on the form.  For example:
-# When I select "7:30AM" as the "Gym" time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" time(?: within "([^\"]*)")?$/ do |time, time_label, selector|
-  with_scope(selector) do
-    select_time(time, :from => time_label)
-  end
-end
-
-# Use this step in conjunction with Rail's date_select helper.  For example:
-# When I select "February 20, 1981" as the date
-When /^(?:|I )select "([^\"]*)" as the date(?: within "([^\"]*)")?$/ do |date, selector|
-  with_scope(selector) do
-    select_date(date)
-  end
-end
-
-# Use this step when using multiple date_select helpers on one page or
-# you want to specify the name of the date on the form. For example:
-# When I select "April 26, 1982" as the "Date of Birth" date
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date(?: within "([^\"]*)")?$/ do |date, date_label, selector|
-  with_scope(selector) do
-    select_date(date, :from => date_label)
-  end
-end
-
 When /^(?:|I )check "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
   with_scope(selector) do
     check(field)
@@ -152,9 +93,9 @@ end
 Then /^(?:|I )should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      has_content?(text).should be_true
+      page.should have_content(text)
     else
-      assert has_content?(text)
+      assert page.has_content?(text)
     end
   end
 end
@@ -163,9 +104,9 @@ Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selec
   regexp = Regexp.new(regexp)
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      has_xpath?('//*', :text => regexp).should be_true
+      page.should have_xpath('//*', :text => regexp)
     else
-      assert has_xpath('//*', :text => regexp)
+      assert page.has_xpath?('//*', :text => regexp)
     end
   end
 end
@@ -173,9 +114,9 @@ end
 Then /^(?:|I )should not see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      has_content?(text).should be_false
+      page.should_not have_content(text)
     else
-      assert_not has_content?(text)
+      assert_not page.has_content?(text)
     end
   end
 end
@@ -184,9 +125,9 @@ Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, s
   regexp = Regexp.new(regexp)
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      has_xpath?('//*', :text => regexp).should be_false
+      page.should_not have_xpath('//*', :text => regexp)
     else
-      assert_not has_xpath?('//*', :text => regexp)
+      assert_not page.has_xpath?('//*', :text => regexp)
     end
   end
 end
@@ -194,7 +135,7 @@ end
 Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should contain "([^\"]*)"$/ do |field, selector, value|
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      field_labeled(field).value.should =~ /#{value}/
+      find_field(field).value.should =~ /#{value}/
     else
       assert_match(/#{value}/, field_labeled(field).value)
     end
@@ -214,7 +155,7 @@ end
 Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should be checked$/ do |label, selector|
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      field_labeled(label)['checked'].should == 'checked'
+      find_field(label)['checked'].should == 'checked'
     else
       assert field_labeled(label)['checked'] == 'checked'
     end
@@ -224,7 +165,7 @@ end
 Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should not be checked$/ do |label, selector|
   with_scope(selector) do
     if defined?(Spec::Rails::Matchers)
-      field_labeled(label)['checked'].should_not == 'checked'
+      find_field(label)['checked'].should_not == 'checked'
     else
       assert field_labeled(label)['checked'] != 'checked'
     end

data/generators/cucumber/templates/support/edit_warning.txt

@@ -1,4 +1,5 @@
 # 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.
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.

data/generators/feature/templates/feature.erb

@@ -29,9 +29,9 @@ Feature: Manage <%= plural_name %>
   # Javascript events. Only Culerity supports confirmation dialogs.
   # 
   # cucumber-rails will turn off transactions for scenarios tagged with 
-  # @culerity, @javascript or @no-txn and clean the database with DatabaseCleaner.
-  # after the scenario has finished. This is to prevent data from leaking into
-  # the next scenario.
+  # @selenium, @culerity, @javascript or @no-txn and clean the database with 
+  # DatabaseCleaner after the scenario has finished. This is to prevent data 
+  # from leaking into the next scenario.
   #
   # Culerity has some performance overhead, and there are two alternatives to using
   # Culerity:

data/lib/cucumber/rails/active_record.rb

@@ -3,11 +3,11 @@ if defined?(ActiveRecord::Base)
     $__cucumber_global_use_txn = !!Cucumber::Rails::World.use_transactional_fixtures if $__cucumber_global_use_txn.nil?
   end
 
-  Before('~@no-txn', '~@culerity', '~@javascript') do
+  Before('~@no-txn', '~@selenium', '~@culerity', '~@javascript') do
     Cucumber::Rails::World.use_transactional_fixtures = $__cucumber_global_use_txn
   end
 
-  Before('@no-txn', '@culerity', '@javascript') do
+  Before('@no-txn', '@selenium', '@culerity', '@javascript') do
     Cucumber::Rails::World.use_transactional_fixtures = false
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.rc6
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Dennis Bl\xC3\xB6te"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2009-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.5.rc2
+        version: 0.5.0
     version: 
 description: Cucumber Generators and Runtime for Rails
 email: cukes@googlegroups.com
@@ -89,9 +89,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []