aslakhellesoy-cucumber 0.1.13.3 → 0.1.14.1

data/History.txt

@@ -1,14 +1,24 @@
 == In Git
 
+=== New features
+* 한국어! (Korean!) (John Hwang)
+
+== 0.1.14 2009-01-04
+
+This is the first release of Cucumber that runs on Ruby 1.9. There are still some encoding-related issues 
+with Arabic (ar), Japanese (ja) and Simplified Chinese (zh-CN). Patches are welcome. Other than that - 
+a couple of minor bug fixes and polishing.
+
 === New features
 * Pretty formatter shows number of scenarios (#139 Joseph Wilk)
+* Rudimentary support for Ruby 1.9. Now it's ok to file Ruby 1.9-related bugs.
 
 === Bugfixes
 * Fixed "No such file or directory -- cucumber (LoadError)" bug with AutoTest (Aslak Hellesøy)
 * Fixed `load_missing_constant': uninitialized constant Dispatcher error with Rails (Aslak Hellesøy)
 
 === Removed features
-
+* The #binary= method is gone from the Rake task. It will always point to the binary in the current gem. (Aslak Hellesøy)
 
 == 0.1.13 2008-12-20
 

data/Manifest.txt

@@ -65,6 +65,11 @@ examples/i18n/ja/features/addition.feature
 examples/i18n/ja/features/division.feature
 examples/i18n/ja/features/step_definitons/calculator_steps.rb
 examples/i18n/ja/lib/calculator.rb
+examples/i18n/ko/Rakefile
+examples/i18n/ko/features/addition.feature
+examples/i18n/ko/features/division.feature
+examples/i18n/ko/features/step_definitons/calculator_steps.rb
+examples/i18n/ko/lib/calculator.rb
 examples/i18n/lt/Rakefile
 examples/i18n/lt/features/addition.feature
 examples/i18n/lt/features/division.feature
@@ -96,7 +101,6 @@ 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/java/src/cucumber/demo/Hello.java
 examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/stories_steps.rb
@@ -182,6 +186,7 @@ lib/cucumber/treetop_parser/feature_fr.rb
 lib/cucumber/treetop_parser/feature_id.rb
 lib/cucumber/treetop_parser/feature_it.rb
 lib/cucumber/treetop_parser/feature_ja.rb
+lib/cucumber/treetop_parser/feature_ko.rb
 lib/cucumber/treetop_parser/feature_lt.rb
 lib/cucumber/treetop_parser/feature_nl.rb
 lib/cucumber/treetop_parser/feature_no.rb

data/config/hoe.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cucumber/version'
 
 AUTHOR = 'Aslak Hellesøy'  # can also be an array of Authors

data/examples/calculator_ruby_features/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 
 class Calculator
   def push(n)

data/examples/cs/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'Calculator'
 

data/examples/i18n/Rakefile

@@ -4,13 +4,29 @@ task :i18n do
   Dir["#{dir}/*"].each do |f|
     if File.directory?(f)
       lang = f[dir.length+1..-1]
-      Dir.chdir(f) do
-        rake("features")
+      if supported?(lang)
+        Dir.chdir(f) do
+          rake("features")
+        end
+      else
+        STDERR.puts %{
+!!!!!
+!!!!! SKIPPING #{lang} (Haven't made it work on Ruby 1.9 yet)
+!!!!!
+}
       end
     end
   end
 end
 
+def supported?(lang)
+  if RUBY_VERSION =~ /^1\.9/
+    !%w{ar ja ko zh-CN}.index(lang)
+  else
+    true
+  end
+end
+
 def rake(args)
   ruby(File.join(Gem.bindir, 'rake'), args)
 end

data/examples/i18n/ar/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/da/features/step_definitons/kalkulator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'kalkulator'

data/examples/i18n/de/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/en/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/es/features/step_definitons/calculador_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculador'

data/examples/i18n/et/features/step_definitions/kalkulaator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'kalkulaator'

data/examples/i18n/fr/features/step_definitions/calculatrice_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculatrice'

data/examples/i18n/id/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/it/features/step_definitons/calcolatrice_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calcolatrice'

data/examples/i18n/ja/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 $KCODE = 'e'

data/examples/i18n/lt/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/no/features/step_definitons/kalkulator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'kalkulator'

data/examples/i18n/pt/features/step_definitions/calculadora_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculadora'

data/examples/i18n/ro/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/i18n/se/features/step_definitons/kalkulator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'kalkulator'

data/examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb

@@ -1,4 +1,5 @@
-require 'spec'
+# encoding: utf-8
+require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'
 require 'calculator'

data/examples/java/features/step_definitons/hello_steps.rb

@@ -1,4 +1,4 @@
-require 'spec' # so we can call .should
+require 'spec/expectations' # so we can call .should
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../src') # so the jar is found
 require 'cucumber_demo' # puts the jar on the classpath
 include_class 'cucumber.demo.Hello'

data/examples/java/features/step_definitons/tree_steps.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 include_class 'java.util.TreeSet'
 
 Given /I have an empty set/ do

data/examples/selenium/features/step_definitons/stories_steps.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 require 'selenium'
 
 class GoogleSearch

data/examples/tickets/features/step_definitons/tickets_steps.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 
 World do
   Object.new

data/examples/watir/README.textile

@@ -0,0 +1,16 @@
+Here you'll find examples for Watir, FireWatir, SafariWatir and Celerity.
+All of these browser libraries have the same API, so the example code will
+work with all of them.
+
+Just run with:
+
+  rake features
+  
+This will use Watir/IE if you're on Windows, and SafariWatir/Safari if you're on OS X.
+You can force the use of FireWatir/Firefox on any platform like this:
+
+  rake features FIREWATIR=true
+  
+And finally, you can use Celerity by running in JRuby:
+
+  jruby -S rake features

data/examples/watir/features/support/env.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 
 if ENV['FIREWATIR']
   require 'firewatir'

data/gem_tasks/rspec.rake

@@ -8,14 +8,14 @@ EOS
 end
 
 def require_spec
-  require 'spec'
+  require 'spec/expectations'
 rescue LoadError
   require_spec_with_rubygems
 end
 
 def require_spec_with_rubygems
   require 'rubygems'
-  require 'spec'
+  require 'spec/expectations'
 rescue LoadError
   unable_to_load
 end

data/gem_tasks/treetop.rake

@@ -3,7 +3,7 @@ class FeatureCompiler
     require 'yaml'
     require 'erb'
     
-    @tt = PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
+    @tt = RUBY_PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
 
     @template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/treetop_parser/feature.treetop.erb'))
     @langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/languages.yml')

data/lib/autotest/cucumber_mixin.rb

@@ -122,6 +122,6 @@ module Autotest::CucumberMixin
     else
       scenario_args = scenarios_to_run.map { |s| "-s '#{s}'" }.join(' ')
     end
-    return "#{Cucumber::RUBY} #{Cucumber::BINARY} #{args} #{scenario_args}"
+    return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args} #{scenario_args}"
   end
 end

data/lib/cucumber/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'cucumber'
+require 'ostruct'
 
 module Cucumber
   class YmlLoadError < StandardError; end
@@ -344,7 +345,7 @@ Defined profiles in cucumber.yml:
     def enable_diffing
       if defined?(::Spec)
         require 'spec/expectations/differs/default'
-        options = ::Spec::Runner::Options.new(nil, nil)
+        options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
         ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
       end
     end

data/lib/cucumber/core_ext/string.rb

@@ -20,7 +20,7 @@ class String
     s
   end
 
-  if (Cucumber::JRUBY && Cucumber::RAILS)
+  if (Cucumber::JRUBY && Cucumber::RAILS) || Cucumber::RUBY_1_9
     # Workaround for http://tinyurl.com/55uu3u 
     alias jlength length
   else

data/lib/cucumber/formatters/ansicolor.rb

@@ -19,7 +19,7 @@ Term::ANSIColor.coloring = false if !STDOUT.tty? || (Cucumber::WINDOWS && !Cucum
 module Cucumber
   module Formatters
     # Defines aliases for coloured output. You can tweak the colours by defining
-    # a <tt>Cucumber::COLORS</tt> variable in your shell, very much like you can
+    # a <tt>CUCUMBER_COLORS</tt> variable in your shell, very much like you can
     # tweak the familiar POSIX command <tt>ls</tt> with
     # <a href="http://mipsisrisc.com/rambling/2008/06/27/lscolorsls_colors-now-with-linux-support/">$LSCOLORS/$LS_COLORS</a>
     #

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -178,15 +178,16 @@ module Cucumber
 
         print_pending_messages if @pending_messages.any?
 
-        @io.puts "#{@total_scenario_count} scenarios"
+        @io.puts dump_count(@total_scenario_count, "scenario")
 
-        @io.puts pending("#{@pending_scenarios.length} scenarios pending") if @pending_scenarios.any?
+        @io.puts pending(dump_count(@pending_scenarios.length, "scenario", "pending")) if @pending_scenarios.any?
+
+        @io.puts passed(dump_count(@passed.length, "step", "passed"))   if @passed.any?
+        @io.puts passed(dump_count(@failed.length, "step", "failed"))   if @failed.any?
+        @io.puts passed(dump_count(@skipped.length, "step", "skipped")) if @skipped.any?
 
-        @io.puts passed("#{@passed.length} steps passed")           if @passed.any?
-        @io.puts failed("#{@failed.length} steps failed")           if @failed.any?
-        @io.puts skipped("#{@skipped.length} steps skipped")        if @skipped.any?
         if @pending_steps.any?
-          @io.print pending("#{@pending_steps.length} steps pending") 
+          @io.print pending(dump_count(@pending_steps.length, "step", "pending")) 
           @io.print pending(" (#{number_of_unimplemented_steps} with no step definition)") if number_of_unimplemented_steps > 0
           @io.puts
         end
@@ -195,6 +196,10 @@ module Cucumber
 
         print_snippets if @options[:snippets]
       end
+      
+      def dump_count(count, what, state=nil)
+        return [count, "#{what}#{count == 1 ? '' : 's'}", state].compact.join(" ")
+      end
 
       def print_pending_messages
         @io.puts "Pending Notes:"

data/lib/cucumber/formatters/unicode.rb

@@ -2,7 +2,7 @@
 require 'cucumber/platform'
 require 'cucumber/formatters/ansicolor'
 
-$KCODE='u'
+$KCODE='u' unless Cucumber::RUBY_1_9
 
 if Cucumber::WINDOWS_MRI && `chcp` =~ /Active code page: (\d+)/
   codepage = $1.to_i

data/lib/cucumber/languages.yml

@@ -258,3 +258,14 @@
   then: 那么
   and: 而且
   but: 但是
+# Korean
+"ko":
+  feature: 기능
+  scenario: 예
+  more_examples: 다른 예
+  given_scenario: 주어진 예
+  given: 조건
+  when: 만일
+  then: 그러면
+  and: 그리고
+  but: 하지만

data/lib/cucumber/platform.rb

@@ -10,7 +10,8 @@ module Cucumber
   WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
   WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
   RAILS         = defined?(Rails)
-  RUBY          = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
 
   class << self
     attr_reader :language

data/lib/cucumber/rails/rspec.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 require 'spec/rails'
 
 # Hack to stop RSpec from dumping the summary

data/lib/cucumber/treetop_parser/feature.treetop.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ar.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_cy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_da.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_de.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en-lol.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en-tx.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_es.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_et.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_fr.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_id.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_it.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ja.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_lt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_nl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_no.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_parser.rb

@@ -20,7 +20,9 @@ module Cucumber
       end
       
       def parse_feature(file)
-        ast = parse(IO.read(file))
+        gherkin = IO.read(file)
+        gherkin = gherkin.force_encoding('utf-8') if Cucumber::RUBY_1_9
+        ast = parse(gherkin)
         if ast.nil?
           raise SyntaxError.new(file, self)
         else

data/lib/cucumber/treetop_parser/feature_pl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_pt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ro.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ro2.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ru.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_se.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_zh-CN.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 13
-    PATCH = 4 # Set to nil for official release
+    TINY  = 14
+    PATCH = 2 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/formatters/pretty_formatter_spec.rb

@@ -86,7 +86,14 @@ module Cucumber
         it "should display as pending in the dump" do
           @formatter.scenario_executing(@scenario)
           @formatter.dump
-          @io.string.should include("1 scenarios pending")
+          @io.string.should include("1 scenario pending")
+        end
+
+        it "should display as pending in the dump (with two scenarios)" do
+          @formatter.scenario_executing(@scenario)
+          @formatter.scenario_executing(@scenario)
+          @formatter.dump
+          @io.string.should include("2 scenarios pending")
         end
       end
       
@@ -315,16 +322,40 @@ module Cucumber
         io.string.should include("1 with no step definition")
       end
 
-      it "should display the total number of scenarios executed" do
+      it "should display the total number of scenarios executed (for 0 scenarios)" do
         io = StringIO.new
         formatter = PrettyFormatter.new io, mock('step_mother')
                 
+        formatter.dump
+        
+        io.string.should include("0 scenarios")
+      end
+          
+      it "should display the total number of scenarios executed (for 1 scenario)" do
+        io = StringIO.new
+        formatter = PrettyFormatter.new io, mock('step_mother')
+                
+        formatter.scenario_executing(mock_scenario)
+        formatter.scenario_executed(mock_scenario)
+
+        formatter.dump
+        
+        io.string.should include("1 scenario")
+      end
+          
+      it "should display the total number of scenarios executed (for 2 scenarios)" do
+        io = StringIO.new
+        formatter = PrettyFormatter.new io, mock('step_mother')
+                
+        formatter.scenario_executing(mock_scenario)
+        formatter.scenario_executed(mock_scenario)
+
         formatter.scenario_executing(mock_scenario)
         formatter.scenario_executed(mock_scenario)
 
         formatter.dump
         
-        io.string.should include("1 scenarios")
+        io.string.should include("2 scenarios")
       end
           
       describe "colour" do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 gem 'rspec'
-require 'spec'
+require 'spec/expectations'
 
 ENV['CUCUMBER_COLORS']=nil
 $KCODE='u'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.13.3
+  version: 0.1.14.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-29 00:00:00 -08:00
+date: 2009-01-05 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,6 @@ files:
 - examples/java/features/step_definitons/hello_steps.rb
 - examples/java/features/step_definitons/tree_steps.rb
 - examples/java/features/tree.feature
-- examples/java/src/cucumber/demo/Hello.java
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
 - examples/selenium/features/step_definitons/stories_steps.rb
@@ -175,6 +174,7 @@ files:
 - examples/tickets/features/step_definitons/scenario_outline_steps.rb
 - examples/tickets/features/step_definitons/tickets_steps.rb
 - examples/tickets/features/tickets.feature
+- examples/watir/README.textile
 - examples/watir/Rakefile
 - examples/watir/features/search.feature
 - examples/watir/features/step_definitons/search_steps.rb

data/examples/java/src/cucumber/demo/Hello.java

@@ -1,16 +0,0 @@
-package cucumber.demo;
-
-public class Hello {
-    public String greet(String who, String from) {
-        return "Hi, " + who + ". I'm " + from;
-    }
-    
-    public boolean isFriend(String who) {
-        return true;
-    }
-    
-    public String getPhoneNumber(String who) {
-        throw new RuntimeException("NOPE");
-        //return "98219458";
-    }
-}