cucumber 0.5.3 → 0.6.0

data/examples/i18n/no/features/support/env.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-$KCODE='u' unless Cucumber::RUBY_1_9
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'kalkulator'

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do

data/examples/i18n/pl/features/support/env.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'
-$KCODE='u' unless Cucumber::RUBY_1_9

data/examples/i18n/pt/features/support/env.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
-$KCODE='u' unless Cucumber::RUBY_1_9
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculadora'

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do

data/examples/i18n/ru/features/support/env.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'
-$KCODE='u' unless Cucumber::RUBY_1_9

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'kalkulator'
 
 Before do

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do

data/examples/i18n/sr-latn/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-# require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+require 'spec/expectations'
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do
@@ -20,5 +20,5 @@ Kada /pritisnem (\w+)/ do |op|
 end
 
 Onda /bi trebalo da bude (.*) prikazano na ekranu/ do |result|
-  @result.to_f == result.to_f
+  @result.should == result.to_f
 end

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

@@ -1,8 +1,4 @@
 # encoding: utf-8
-# require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatter/unicode'
-require 'calculator'
 
 Before do
   @calc = Calculator.new
@@ -20,5 +16,5 @@ end
 end
 
 Онда /би требало да буде (.*) прикаѕано на екрану/ do |result|
-  @result.to_f == result.to_f
+  @result.should == result.to_f
 end

data/examples/i18n/sr/features/support/env.rb

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

data/examples/i18n/tr/features/step_definitons/hesap_makinesi_adimlari.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'hesap_makinesi'
 
 Before do

data/examples/i18n/uz/features/support/env.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'
-$KCODE='u' unless Cucumber::RUBY_1_9

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
 require 'cucumber/formatter/unicode'
+$:.unshift(File.dirname(__FILE__) + '/../../lib') 
 require 'calculator'
 
 Before do

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -69,6 +69,8 @@ end
 Given /^another unused$/ do
 end
 
+require 'fileutils'
+
 after_file = File.expand_path(File.dirname(__FILE__) + '/../../tmp/after.txt')
 
 Before do

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

@@ -1,44 +1,47 @@
 # This is an example of how you can set up screenshots for your
 # browser testing. Just run cucumber with --format html --out report.html
 #
-# This examples currently only works on OS X, but adding support for other
-# platform should be easy - as long as there is a command line tool to take
-# a picture of the desktop.
+# The code below will work on OS X or Windows (with IE Watir only).
+# Adding support for other platforms should be easy - as long as there is a 
+# ruby library or command line tool to take pictures.
+#
 module Screenshots
-  def add_screenshot
-    id = "screenshot-#{Time.new.to_i}"
-    take_screenshot(id)
-    embed("#{id}.png", "image/png")
-  end
-
   if Cucumber::OS_X
-    def take_screenshot(id)
+    def embed_screenshot(id)
       `screencapture -t png #{id}.png`
+      embed("#{id}.png", "image/png")
+    end
+  elsif Cucumber::WINDOWS
+    # http://wtr.rubyforge.org/rdoc/classes/Watir/ScreenCapture.html
+    require 'watir/screen_capture'
+    include Watir::ScreenCapture
+    def embed_screenshot(id)
+      screen_capture("#{id}.jpg", true)
+      embed("#{id}.jpg", "image/jpeg")
     end
   else
     # Other platforms...
-    def take_screenshot(id)
+    def embed_screenshot(id)
       STDERR.puts "Sorry - no screenshots on your platform yet."
     end
   end
 end
+World(Screenshots)
 
 After do
-  add_screenshot
+  embed_screenshot("screenshot-#{Time.new.to_i}")
 end
 
-# Other variants
+# Other variants:
 #
 # Only take screenshot on failures
 #
 #   After do |scenario|
-#     add_screenshot if scenario.failed?
+#     embed_screenshot("screenshot-#{Time.new.to_i}") if scenario.failed?
 #   end
 #
 # Only take screenshot for scenarios or features tagged @screenshot
 #
 #   After(@screenshot) do
-#     add_screenshot
+#     embed_screenshot("screenshot-#{Time.new.to_i}")
 #   end
-
-World(Screenshots)

data/features/call_many_steps.feature

@@ -78,6 +78,7 @@ Feature: http://gist.github.com/221223
 
       """
 
+  @fails_on_1_9
   Scenario: Call multiline string
     When I run cucumber features/f.feature:10
     Then STDERR should be empty
@@ -101,6 +102,7 @@ Feature: http://gist.github.com/221223
 
       """
 
+  @fails_on_1_9
   Scenario: Call table
     When I run cucumber features/f.feature:13
     Then STDERR should be empty

data/features/cucumber_cli.feature

@@ -556,6 +556,7 @@ Feature: Cucumber command line
 
    Scenario: Run with limited tag count, blowing it via feature inheritance
      When I run cucumber -q features/tags_sample.feature --no-source --dry-run --tags @sample_one:1
+     Then STDERR should be empty
      Then it should fail with
      """
      @sample_one
@@ -617,14 +618,16 @@ Feature: Cucumber command line
 
       """
 
+  # Fails on 1.9 because of encoding issues.
+  @fails_on_1_9
   Scenario: Generate PDF with pdf formatter
-	When I run cucumber --format pdf --out tmp/sample.pdf --dry-run features/sample.feature
-	Then STDERR should be empty
-	Then "examples/self_test/tmp/sample.pdf" should match "Pages 2"
+    When I run cucumber --format pdf --out tmp/sample.pdf --dry-run features/sample.feature
+    Then STDERR should be empty
+    Then "examples/self_test/tmp/sample.pdf" should match "Pages 2"
 
   Scenario: Run feature elements which match a name using -n
     When I run cucumber -n Pisang -q features/
-	Then it should pass with
+    Then it should pass with
       """
       Feature: search examples
 

data/features/html_formatter.feature

@@ -1,3 +1,4 @@
+@fails_on_1_9
 Feature: HTML formatter
   In order to make it easy to read Cucumber results
   there should be a HTML formatter with an awesome CSS

data/features/html_formatter/a.html

@@ -336,11 +336,11 @@ features/failing_expectation.feature:4:in `Given failing expectation':in `Given
   pending # express the regexp above with the code you wish you had
 end</pre></li> <script type="text/javascript">moveProgressBar('39.6');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_5' class='step undefined'><div><span class="keyword">Given</span> <span class="step val">it's 40 degrees in Norway</span></div><pre>Given /^it's 40 degrees in Norway$/ do
   pending # express the regexp above with the code you wish you had
-end</pre></li> <script type="text/javascript">moveProgressBar('40.2');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_6' class='step undefined'><div><span class="keyword">And</span> <span class="step val">it's 40 degrees in Norway</span></div><pre>And /^it's 40 degrees in Norway$/ do
+end</pre></li> <script type="text/javascript">moveProgressBar('40.2');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_6' class='step undefined'><div><span class="keyword">And</span> <span class="step val">it's 40 degrees in Norway</span></div><pre>Given /^it's 40 degrees in Norway$/ do
   pending # express the regexp above with the code you wish you had
 end</pre></li> <script type="text/javascript">moveProgressBar('40.8');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_7' class='step undefined'><div><span class="keyword">When</span> <span class="step val">I stop procrastinating</span></div><pre>When /^I stop procrastinating$/ do
   pending # express the regexp above with the code you wish you had
-end</pre></li> <script type="text/javascript">moveProgressBar('41.4');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_8' class='step undefined'><div><span class="keyword">And</span> <span class="step val">there is world peace</span></div><pre>And /^there is world peace$/ do
+end</pre></li> <script type="text/javascript">moveProgressBar('41.4');</script><script>makeYellow('scenario_20');</script><li id='features_lots_of_undefined_feature_8' class='step undefined'><div><span class="keyword">And</span> <span class="step val">there is world peace</span></div><pre>When /^there is world peace$/ do
   pending # express the regexp above with the code you wish you had
 end</pre></li> <script type="text/javascript">moveProgressBar('42.0');</script></ol></div></div><div class="feature"><h2><span class="val">Feature: multiline</span></h2><p class="narrative"></p><div class="background"><h3><span class="keyword">Background:</span> <span class="val">I'm a multiline name
 which goes on and on and on for three lines

data/features/language_help.feature

@@ -1,3 +1,4 @@
+@needs-many-fonts
 Feature: Language help
   In order to figure out the keywords to use for a language
   I want to be able to get help on the language from the CLI

data/features/step_definitions/cucumber_steps.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'tempfile'
 
 Given /^I am in (.*)$/ do |example_dir_relative_path|
@@ -66,8 +67,8 @@ Then /^it should (fail|pass)$/ do |success|
 end
 
 Then /^it should (fail|pass) with$/ do |success, output|
-  Then("it should #{success}")
   last_stdout.should == output
+  Then("it should #{success}")
 end
 
 Then /^the output should contain$/ do |text|
@@ -82,7 +83,6 @@ Then /^the output should be$/ do |text|
   last_stdout.should == text
 end
 
-
 Then /^"([^\"]*)" should contain$/ do |file, text|
   strip_duration(IO.read(file)).should == text
 end
@@ -95,7 +95,7 @@ Then /^"([^\"]*)" with junit duration "([^\"]*)" should contain$/ do |actual_fil
 end
 
 Then /^"([^\"]*)" should match "([^\"]*)"$/ do |file, text|
-  IO.read(file).should =~ Regexp.new(text)
+  File.open(file, Cucumber.file_mode('r')).read.should =~ Regexp.new(text)
 end
 
 Then /^"([^\"]*)" should have the same contents as "([^\"]*)"$/ do |actual_file, expected_file|

data/features/support/env.rb

@@ -3,11 +3,7 @@ require 'tempfile'
 require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
-begin
-  require 'spork'
-rescue Gem::LoadError => ex
-  gem 'spork', '>= 0.7.3' # Ensure correct spork version number to avoid false-negatives.
-end
+require 'cucumber/formatter/unicode'
 
 class CucumberWorld
   extend Forwardable
@@ -99,6 +95,12 @@ class CucumberWorld
   end
 
   def run_spork_in_background(port = nil)
+    begin
+      require 'spork'
+    rescue Gem::LoadError => ex
+      gem 'spork', '>= 0.7.3' # Ensure correct spork version number to avoid false-negatives.
+    end
+
     pid = fork
     in_current_dir do
       if pid

data/features/tag_logic.feature

@@ -26,7 +26,7 @@ Feature: Tag logic
       """
 
   Scenario: ANDing tags
-    When I run cucumber -q -t @one,@three features/tagulicious.feature
+    When I run cucumber -q -t @one -t @three features/tagulicious.feature
     Then it should pass
     And the output should contain
       """
@@ -42,7 +42,7 @@ Feature: Tag logic
       """
 
   Scenario: ORing tags
-    When I run cucumber -q -t @one -t @three features/tagulicious.feature
+    When I run cucumber -q -t @one,@three features/tagulicious.feature
     Then it should pass
     And the output should contain
       """
@@ -68,7 +68,7 @@ Feature: Tag logic
   Scenario: Before hooks ORing
     Given a file named "features/support/hooks.rb" with:
       """
-      Before('@one', '@three') do
+      Before('@one,@three') do
         raise 'boom'
       end
       """
@@ -111,7 +111,7 @@ Feature: Tag logic
   Scenario: Before hooks ANDing
     Given a file named "features/support/hooks.rb" with:
       """
-      Before('@one,@three') do
+      Before('@one','@three') do
         raise 'boom'
       end
       """
@@ -148,7 +148,7 @@ Feature: Tag logic
   Scenario: Before hooks ANDing with a bad hook matching nothing
     Given a file named "features/support/hooks.rb" with:
       """
-      Before('@one,@notused') do
+      Before('@one','@notused') do
         raise 'boom'
       end
       """
@@ -180,7 +180,7 @@ Feature: Tag logic
   Scenario: After hooks ORing
     Given a file named "features/support/hooks.rb" with:
       """
-      After('@one', '@three') do
+      After('@one,@three') do
         raise 'boom'
       end
       """
@@ -223,7 +223,7 @@ Feature: Tag logic
   Scenario: After hooks ANDing
     Given a file named "features/support/hooks.rb" with:
       """
-      After('@one,@three') do
+      After('@one','@three') do
         raise 'boom'
       end
       """

data/features/wire_protocol.feature

@@ -24,7 +24,7 @@ Feature: Wire Protocol
   #
   # Every message supports two standard responses:
   #   * success        : which expects different arguments (sometimes none at
-  #                      depending on the request.
+  #                      all) depending on the request.
   #   * fail           : causes a Cucumber::WireSupport::WireException to be
   #                      raised.
   #

data/gem_tasks/features.rake

@@ -9,6 +9,8 @@ Cucumber::Rake::Task.new do |t|
     t.profile = 'jruby'
   elsif(Cucumber::WINDOWS_MRI)
     t.profile = 'windows_mri'
+  elsif(Cucumber::RUBY_1_9)
+    t.profile = 'ruby_1_9'
   end
   t.rcov = ENV['RCOV']
 end

data/lib/autotest/cucumber_mixin.rb

@@ -1,7 +1,7 @@
 require 'autotest'
 require 'tempfile'
-require 'yaml'
 require 'cucumber'
+require 'cucumber/cli/profile_loader'
 
 module Autotest::CucumberMixin
   def self.included(receiver)
@@ -104,10 +104,10 @@ module Autotest::CucumberMixin
   def make_cucumber_cmd(features_to_run, dirty_features_filename)
     return '' if features_to_run == ''
     
-    profiles = YAML.load_file("cucumber.yml").keys rescue []
+    profile_loader = Cucumber::Cli::ProfileLoader.new
     
-    profile ||= "autotest-all" if profiles.include?("autotest-all") and features_to_run == :all
-    profile ||= "autotest"     if profiles.include?("autotest")
+    profile ||= "autotest-all" if profile_loader.has_profile?("autotest-all") && features_to_run == :all
+    profile ||= "autotest"     if profile_loader.has_profile?("autotest")
     profile ||= nil
     
     if profile