Merge changes from master

History.txt

@@ -67,12 +67,27 @@ More blurb ideas
 * "More Examples" is gone. "Scenario" + "More Examples" is no longer supported. Use "Scenario Outline" + "Examples" instead.
 * Pure Ruby features are no longer supported
 
-== Git (master)
+== 0.1.16.x (Master)
 
-=== New features
+Bugfix release.
+
+IMPORTANT NOTE FOR RAILS USERS.
+The template used to generate your features/support/env.rb has changed. You have to apply a minor change
+manually for existing Rails projects when you upgrade to this version. Change this:
+
+  require 'webrat/rspec-rails'
+
+to this:
 
+  require 'webrat/core/matchers'
+
+=== New features
 * Finnish translation (Tero Tilus)
-* Use Webrat's #contain matcher in generated "I should (not) see" step definitions
+* Use Webrat's #contain matcher in generated "I should (not) see" step definitions (Bryan Helmkamp)
+
+== Bugfixes
+* Better handling of ARGV (#169 David Chelimsky)
+* Compatibility with ruby-debug (do ARGV.dup in bin/cucumber so it can restart ruby with same args) (Aslak Hellesøy)
 
 == 0.1.16 2009-01-19
 

Manifest.txt

@@ -103,10 +103,15 @@ examples/java/features/hello.feature
 examples/java/features/step_definitons/hello_steps.rb
 examples/java/features/step_definitons/tree_steps.rb
 examples/java/features/tree.feature
+examples/jbehave/README.textile
+examples/jbehave/features/support/env.rb
+examples/jbehave/features/trading.feature
+examples/jbehave/pom.xml
 examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/stories_steps.rb
 examples/self_test/README.textile
+examples/self_test/features/call_undefined_step_from_step_def.feature
 examples/self_test/features/outline_sample.feature
 examples/self_test/features/sample.feature
 examples/self_test/features/step_definitions/sample_steps.rb
@@ -128,6 +133,7 @@ examples/watir/features/step_definitons/search_steps.rb
 examples/watir/features/support/env.rb
 features/cucumber_cli.feature
 features/cucumber_cli_outlines.feature
+features/report_called_undefined_steps.feature
 features/step_definitions/cucumber_steps.rb
 features/step_definitions/extra_steps.rb
 features/support/env.rb
@@ -178,6 +184,7 @@ lib/cucumber/formatters/html_formatter.rb
 lib/cucumber/formatters/jquery.js
 lib/cucumber/formatters/pretty_formatter.rb
 lib/cucumber/formatters/unicode.rb
+lib/cucumber/jbehave.rb
 lib/cucumber/languages.yml
 lib/cucumber/parser.rb
 lib/cucumber/parser/basic.rb

features/support/env.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 require 'fileutils'
 
 Before do

lib/cucumber/rails/rspec.rb

@@ -1,12 +1,5 @@
 require 'spec/expectations'
-require 'spec/rails'
-
-# Hack to stop RSpec from dumping the summary
-Spec::Runner::Options.class_eval do
-  def examples_should_be_run?
-    false
-  end
-end
+require 'spec/rails/matchers'
 
 ActionController::Integration::Session.send(:include, Spec::Matchers)
 ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)

lib/cucumber/version.rb

@@ -3,7 +3,7 @@ class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 16
-    PATCH = 3 # Set to nil for official release
+    PATCH = 5 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

rails_generators/cucumber/templates/env.rb

@@ -13,4 +13,4 @@
 
 # Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
 require 'cucumber/rails/rspec'
-require 'webrat/rspec-rails'
+require 'webrat/core/matchers'