Merge branch 'aslakhellesoy/master'

History.txt

@@ -1,10 +1,24 @@
 == 0.1.16.x (Git)
 
+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 (Bryan Helmkamp)
 
 == Bugfixes
+* Flush output in HTML formatter since JRuby doesnt do it automatically (Diego Carrion)
+* 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

features/support/env.rb

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

lib/cucumber/formatters/html_formatter.rb

@@ -130,6 +130,7 @@ def dump
   </body>
 </html>
 HTML
+        @io.flush
       end
 
       private

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'

spec/cucumber/formatters/html_formatter_spec.rb

@@ -99,6 +99,12 @@ def mock_scenario_outline(stubs = {})
         @io.string.should =~ /Scenario Outline/
       end
 
+      it "should flush the broadcaster after dumping" do
+        io = mock(File, {:puts => nil})
+        io.should_receive(:flush)
+        HtmlFormatter.new(io, nil).dump
+      end
+
     end
   end
 end