cucumber 3.0.0.pre.1 → 3.0.0.pre.2

data/examples/i18n/sr-Latn/lib/calculator.rb

@@ -4,9 +4,9 @@ class Calculator
     @args ||= []
     @args << n
   end
-  
+
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
 end

data/examples/i18n/sv/features/step_definitions/kalkulator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') 
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'kalkulator'
 
 Before do
@@ -11,7 +11,7 @@ end
 After do
 end
 
-Given /att jag har knappat in (\d+)/ do |n|
+Given(/att jag har knappat in (\d+)/) do |n|
   @calc.push n.to_i
 end
 
@@ -19,6 +19,6 @@ When 'jag summerar' do
   @result = @calc.add
 end
 
-Then /ska resultatet vara (\d+)/ do |result|
+Then(/ska resultatet vara (\d+)/) do |result|
   @result.should == result.to_i
 end

data/examples/i18n/sv/lib/kalkulator.rb

@@ -3,9 +3,9 @@ class Kalkulator
     @args ||= []
     @args << n
   end
-  
+
   def add
     #@args[0] + @args[1]
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') 
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'hesap_makinesi'
 
 Before do
@@ -11,14 +11,14 @@ end
 After do
 end
 
-Diyelimki /hesap makinesine (\d+) girdim/ do |n|
+Diyelimki(/hesap makinesine (\d+) girdim/) do |n|
   @calc.push n.to_i
 end
 
-Eğerki /(.*) tuşuna basarsam/ do |op|
+Eğerki(/(.*) tuşuna basarsam/) do |op|
   @result = @calc.send op
 end
 
-Ozaman /ekrandaki sonuç (.*) olmalı/ do |result|
+Ozaman(/ekrandaki sonuç (.*) olmalı/) do |result|
   @result.should == result.to_f
 end

data/examples/i18n/tr/lib/hesap_makinesi.rb

@@ -4,9 +4,9 @@ class HesapMakinesi
     @args ||= []
     @args << n
   end
-  
+
   def topla
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def böl

data/examples/i18n/uk/features/step_definitions/calculator_steps.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 
-Припустимо /ввожу число (\d+)/ do |число|
+Припустимо(/ввожу число (\d+)/) do |число|
   calc.push число.to_i
 end
 
-Якщо /натискаю "(.*)"/ do |операція|
+Якщо(/натискаю "(.*)"/) do |операція|
   calc.send операція
 end
 
-То /результатом повинно бути число (\d+)/ do |результат|
+То(/результатом повинно бути число (\d+)/) do |результат|
   calc.result.should == результат.to_f
 end
 
-Припустимо /я додав (\d+) і (\d+)/ do |доданок1, доданок2|
+Припустимо(/я додав (\d+) і (\d+)/) do |доданок1, доданок2|
   Припустимо %{я ввожу число #{доданок1}}
   Припустимо %{потім ввожу число #{доданок2}}
   Припустимо %{я натискаю "+"}

data/examples/i18n/uz/features/step_definitions/calculator_steps.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 
-Агар /(\d+) сонини киритсам/ do |сон|
+Агар(/(\d+) сонини киритсам/) do |сон|
   calc.push сон.to_i
 end
 
-Агар /"(.*)"(.*) боссам/ do |операция, _|
+Агар(/"(.*)"(.*) боссам/) do |операция, _|
   calc.send операция
 end
 
-Унда /жавоб (\d+) сони булиши керак/ do |жавоб|
+Унда(/жавоб (\d+) сони булиши керак/) do |жавоб|
   calc.result.should == жавоб.to_f
 end
 
-Агар /(\d+) ва (\d+) сонини кушсам/ do |кушилувчи1, кушилувчи2|
+Агар(/(\d+) ва (\d+) сонини кушсам/) do |кушилувчи1, кушилувчи2|
   Агар %{#{кушилувчи1} сонини киритсам}
   Агар %{ундан сунг #{кушилувчи2} сонини киритсам}
   Агар %{"+"ни боссам}

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') 
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'
 
 Before do
@@ -11,16 +11,16 @@ end
 After do
 end
 
-Given /在计算器上输入(\d+)/ do |n|
+Given(/在计算器上输入(\d+)/) do |n|
   @calc.push n.to_i
 end
 
-When /按(.*)键/ do |op|
+When(/按(.*)键/) do |op|
   if op == '加号'
-    @result = @calc.send "add"
+    @result = @calc.send 'add'
   end
 end
 
-Then /屏幕上显示的结果应该是是(.*)/ do |result|
+Then(/屏幕上显示的结果应该是是(.*)/) do |result|
   @result.should == result.to_f
 end

data/examples/i18n/zh-CN/lib/calculator.rb

@@ -3,8 +3,8 @@ class Calculator
     @args ||= []
     @args << n
   end
-  
+
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
 require 'cucumber/formatter/unicode'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') 
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'calculator'
 
 Before do
@@ -11,14 +11,14 @@ end
 After do
 end
 
-Given /我已經在計算機上輸入 (\d+)/ do |n|
+Given(/我已經在計算機上輸入 (\d+)/) do |n|
   @calc.push n.to_i
 end
 
-When /我按下 (\w+)/ do |op|
+When(/我按下 (\w+)/) do |op|
   @result = @calc.send op
 end
 
-Then /螢幕上應該顯示 (.*)/ do |result|
+Then(/螢幕上應該顯示 (.*)/) do |result|
   @result.should == result.to_f
 end

data/examples/i18n/zh-TW/lib/calculator.rb

@@ -3,9 +3,9 @@ class Calculator
     @args ||= []
     @args << n
   end
-  
+
   def add
-    @args.inject(0){|n,sum| sum+=n}
+    @args.inject(0){|n,sum| sum + n}
   end
 
   def divide

data/examples/rspec_doubles/features/step_definitions/calvin_steps.rb

@@ -2,18 +2,18 @@ class CardboardBox
   def initialize(transmogrifier)
     @transmogrifier = transmogrifier
   end
-  
+
   def poke
     @transmogrifier.transmogrify
   end
 end
 
-Given /^I have a cardboard box$/ do
+Given(/^I have a cardboard box$/) do
   transmogrifier = double('transmogrifier')
   transmogrifier.should_receive(:transmogrify)
   @box = CardboardBox.new(transmogrifier)
 end
 
-When /^I poke it all is good$/ do
+When(/^I poke it all is good$/) do
   @box.poke
 end

data/examples/sinatra/features/step_definitions/add_steps.rb

@@ -1,15 +1,15 @@
-Given /^I visit the calculator page$/ do
+Given(/^I visit the calculator page$/) do
   visit '/add'
 end
 
-Given /^I fill in '(.*)' for '(.*)'$/ do |value, field|
+Given(/^I fill in '(.*)' for '(.*)'$/) do |value, field|
   fill_in(field, :with => value)
 end
 
-When /^I press '(.*)'$/ do |name|
+When(/^I press '(.*)'$/) do |name|
   click_button(name)
 end
 
-Then /^I should see '(.*)'$/ do |text|
+Then(/^I should see '(.*)'$/) do |text|
   body.should match(/#{text}/m)
 end

data/examples/tcl/features/step_definitions/fib_steps.rb

@@ -1,7 +1,7 @@
-When /^I ask Tcl to calculate fibonacci for (\d+)$/ do |n|
+When(/^I ask Tcl to calculate fibonacci for (\d+)$/) do |n|
   @fib_result = @fib.eval("fib #{n}").to_i
 end
 
-Then /^it should give me (\d+)$/ do |expected|
+Then(/^it should give me (\d+)$/) do |expected|
   expect(@fib_result).to eq expected.to_i
 end

data/examples/test_unit/features/step_definitions/test_unit_steps.rb

@@ -1,18 +1,18 @@
-Given /^(\w+) = (\w+)$/ do |var, value|
+Given(/^(\w+) = (\w+)$/) do |var, value|
   instance_variable_set("@#{var}", value)
 end
 
 begin
   require 'rubygems'
   require 'matchy'
-  Then /^I can assert that (\w+) == (\w+)$/ do |var_a, var_b|
+  Then(/^I can assert that (\w+) == (\w+)$/) do |var_a, var_b|
     a = instance_variable_get("@#{var_a}")
     b = instance_variable_get("@#{var_b}")
     a.should == b
   end
 rescue LoadError
-  STDERR.puts "***** You should install matchy *****"
-  Then /^I can assert that (\w+) == (\w+)$/ do |var_a, var_b|
+  STDERR.puts '***** You should install matchy *****'
+  Then(/^I can assert that (\w+) == (\w+)$/) do |var_a, var_b|
     a = instance_variable_get("@#{var_a}")
     b = instance_variable_get("@#{var_b}")
     assert_equal(a, b)

data/examples/watir/features/step_definitions/search_steps.rb

@@ -5,12 +5,12 @@ Given 'I am on the Google search page' do
   @browser.goto 'http://www.google.com/'
 end
 
-When /I search for "(.*)"/ do |query|
+When(/I search for "(.*)"/) do |query|
   @browser.text_field(:name, 'q').set(query)
   @browser.button(:name, 'btnG').click
 end
 
-Then /I should see/ do |text|
+Then(/I should see/) do |text|
   @browser.text.should =~ /#{text}/m
 end
 
@@ -23,4 +23,4 @@ end
 #
 # This technique is called "Page Objects", and you can read more about it here:
 # http://github.com/marekj/watirloo/tree/master
-# We're not using this technique here, since we want to illustrate the basics only.
+# We're not using this technique here, since we want to illustrate the basics only.

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

@@ -2,14 +2,14 @@
 # browser testing. Just run cucumber with --format html --out report.html
 #
 # 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 
+# 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
   if Cucumber::OS_X
     def embed_screenshot(id)
       `screencapture -t png #{id}.png`
-      embed("#{id}.png", "image/png")
+      embed("#{id}.png", 'image/png')
     end
   elsif Cucumber::WINDOWS
     # http://wtr.rubyforge.org/rdoc/classes/Watir/ScreenCapture.html
@@ -17,12 +17,12 @@ module Screenshots
     include Watir::ScreenCapture
     def embed_screenshot(id)
       screen_capture("#{id}.jpg", true)
-      embed("#{id}.jpg", "image/jpeg")
+      embed("#{id}.jpg", 'image/jpeg')
     end
   else
     # Other platforms...
-    def embed_screenshot(id)
-      STDERR.puts "Sorry - no screenshots on your platform yet."
+    def embed_screenshot(_id)
+      STDERR.puts 'Sorry - no screenshots on your platform yet.'
     end
   end
 end

data/features/docs/api/list_step_defs_as_json.feature

@@ -8,6 +8,7 @@ Feature: List step defs as json
   Background:
     Given a directory named "features"
 
+  @todo-windows
   Scenario: Two Ruby step definitions, in the same file
     Given a file named "features/step_definitions/steps.rb" with:
       """
@@ -18,16 +19,23 @@ Feature: List step defs as json
       """
       require 'cucumber'
       puts Cucumber::StepDefinitions.new.to_json
-      
+
       """
     Then it should pass with JSON:
       """
       [
-        {"source": "foo", "flags": "i"},
-        {"source": "b.r", "flags": "mx"}
+        {
+          "source": {"expression": "foo", "type": "regular expression"},
+          "regexp": {"source": "foo", "flags": "i"}
+        },
+        {
+          "source": {"expression": "b.r", "type": "regular expression"},
+          "regexp": {"source": "b.r", "flags": "mx"}
+        }
       ]
       """
 
+  @todo-windows
   Scenario: Non-default directory structure
     Given a file named "my_weird/place/steps.rb" with:
       """
@@ -38,13 +46,19 @@ Feature: List step defs as json
       """
       require 'cucumber'
       puts Cucumber::StepDefinitions.new(:autoload_code_paths => ['my_weird']).to_json
-      
+
       """
     Then it should pass with JSON:
       """
       [
-        {"source": "foo", "flags": ""},
-        {"source": "b.r", "flags": "x"}
+        {
+          "source": {"expression": "foo", "type": "regular expression"},
+          "regexp": {"source": "foo", "flags": ""}
+        },
+        {
+          "source": {"expression": "b.r", "type": "regular expression"},
+          "regexp": {"source": "b.r", "flags": "x"}
+        }
       ]
-      
+
       """

data/features/docs/api/listen_for_events.feature

@@ -19,7 +19,7 @@ Feature: Listen for events
       """
       AfterConfiguration do |config|
         io = config.out_stream
-        config.on_event :step_match do |event|
+        config.on_event :step_activated do |event|
           io.puts "Success!"
           io.puts "Step name:       #{event.test_step.name}"
           io.puts "Source location: #{event.step_match.location}"

data/features/docs/api/run_cli_main_with_existing_runtime.feature

@@ -5,6 +5,7 @@ Feature: Run Cli::Main with existing Runtime
   When the process forks, Spork them passes the runtime to Cli::Main to
   run it.
 
+    @todo-windows
     Scenario: Run a single feature
       Given the standard step definitions
       Given a file named "features/success.feature" with:

data/features/docs/cli/dry_run.feature

@@ -64,6 +64,9 @@ Feature: Dry Run
             Undefined step: "this step is undefined" (Cucumber::Undefined)
             features/test.feature:3:in `Given this step is undefined'
 
+      Undefined Scenarios:
+      cucumber features/test.feature:2 # Scenario: 
+
       1 scenario (1 undefined)
       1 step (1 undefined)
 

data/features/docs/cli/execute_with_tag_filter.feature

@@ -26,7 +26,7 @@ Feature: Tag logic
       """
 
   Scenario: ANDing tags
-    When I run `cucumber -q -t @one -t @three features/test.feature`
+    When I run `cucumber -q -t '@one and @three' features/test.feature`
     Then it should pass with:
       """
       @feature
@@ -42,7 +42,7 @@ Feature: Tag logic
       """
 
   Scenario: ORing tags
-    When I run `cucumber -q -t @one,@three features/test.feature`
+    When I run `cucumber -q -t '@one or @three' features/test.feature`
     Then it should pass with:
       """
       @feature
@@ -66,7 +66,7 @@ Feature: Tag logic
       """
 
   Scenario: Negative tags
-    When I run `cucumber -q -t ~@three features/test.feature`
+    When I run `cucumber -q -t 'not @three' features/test.feature`
     Then it should pass with:
       """
       @feature
@@ -104,7 +104,7 @@ Feature: Tag logic
        """
 
   Scenario: Run with limited tag count using negative tag, blowing it via a tag that is not run
-     When I run `cucumber -q --no-source --tags ~@one:1 features/test.feature`
+     When I run `cucumber -q --no-source --tags 'not @one:1' features/test.feature`
      Then it fails before running features with:
        """
        @one occurred 2 times, but the limit was set to 1