cucumber 1.2.5 → 1.3.0

data/features/transforms.feature

@@ -15,7 +15,9 @@ Feature: Transforms
       """
     And a file named "features/support/person.rb" with:
       """
-      class Person < Struct.new(:age)
+      class Person
+        attr_accessor :age
+      
         def to_s
           "I am #{age} years old"
         end
@@ -29,18 +31,17 @@ Feature: Transforms
     And a file named "features/step_definitions/steps.rb" with:
       """
       Transform(/a Person aged (\d+)/) do |age|
-        Person.new(age.to_i)
+        person = Person.new
+        person.age = age.to_i
+        person
       end
       
       Given /^(a Person aged \d+) with blonde hair$/ do |person|
-        puts "#{person} and I have blonde hair"
+        person.age.should == 15
       end
       """
-    When I run cucumber "features/foo.feature"
-    Then it should pass with:
-      """
-      I am 15 years old and I have blonde hair
-      """
+    When I run `cucumber features/foo.feature`
+    Then it should pass
   
   Scenario: Re-use Transform's Regular Expression
     If you keep a reference to the transform, you can use it in your
@@ -49,15 +50,14 @@ Feature: Transforms
     And a file named "features/step_definitions/steps.rb" with:
       """
       A_PERSON = Transform(/a Person aged (\d+)/) do |age|
-        Person.new(age.to_i)
+        person = Person.new
+        person.age = age.to_i
+        person
       end
 
       Given /^(#{A_PERSON}) with blonde hair$/ do |person|
-        puts "#{person} and I have blonde hair"
+        person.age.should == 15
       end
       """
-    When I run cucumber "features/foo.feature"
-    Then it should pass with:
-      """
-      I am 15 years old and I have blonde hair
-      """
+    When I run `cucumber features/foo.feature`
+    Then it should pass

data/gem_tasks/cucumber.rake

@@ -7,6 +7,8 @@ class Cucumber::Rake::Task
       Cucumber::WINDOWS ? 'jruby_win' : 'jruby'
     elsif Cucumber::WINDOWS_MRI
       'windows_mri'
+    elsif Cucumber::RUBY_1_8_7
+      'ruby_1_8_7'
     elsif Cucumber::RUBY_1_9
       'ruby_1_9'
     elsif Cucumber::RUBY_2_0

data/gem_tasks/yard.rake

@@ -2,26 +2,30 @@ require 'yard'
 require 'yard/rake/yardoc_task'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/cucumber/platform')
 
+DOC_DIR      = File.expand_path(File.dirname(__FILE__) + '/../doc')
 SITE_DIR     = File.expand_path(File.dirname(__FILE__) + '/../../cucumber.github.com')
 API_DIR      = File.join(SITE_DIR, 'api', 'cucumber', 'ruby', 'yardoc')
 TEMPLATE_DIR = File.expand_path(File.join(File.dirname(__FILE__), 'yard'))
 YARD::Templates::Engine.register_template_path(TEMPLATE_DIR)
 
 namespace :api do
-  task :dir do
+  YARD::Rake::YardocTask.new(:yard) do |yard|
+    yard.options = ["--out", DOC_DIR]
+  end
+
+  task :sync_with_git do
     unless File.directory?(SITE_DIR)
       raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}"
     end
     Dir.chdir(SITE_DIR) do
       sh 'git pull -u'
-      mkdir_p API_DIR
     end
   end
 
-  YARD::Rake::YardocTask.new(:yard) do |yard|
-    yard.options = ["--out", API_DIR]
+  task :copy_to_website do
+    rm_rf API_DIR
+    cp_r DOC_DIR, API_DIR
   end
-  task :yard => :dir
 
   task :release do
     Dir.chdir(SITE_DIR) do
@@ -32,5 +36,5 @@ namespace :api do
   end
 
   desc "Generate YARD docs for Cucumber's API"
-  task :doc => [:yard, :release]
+  task :doc => [:yard, :sync_with_git, :copy_to_website, :release]
 end

data/legacy_features/README.md

@@ -0,0 +1,14 @@
+# Please do not add to the tests in this folder
+
+This folder contains the acceptance tests that were written for Cucumber
+before [Aruba](https://github.com/cucumber/aruba) existed.
+
+These tests are currently run as part of the build, but should not be added to.
+
+New acceptance tests should be added in the `features` directory. If you find a test
+in here that you want to modify, please do the work to migrate it into the `features`
+directory.
+
+There is a ticket [#408](https://github.com/cucumber/cucumber/issues/408) to track 
+the effort to migrate all these tests into the `features` directory. We aim to have this
+completed for the release of Cucumber 2.0

data/legacy_features/language_help.feature

@@ -2,7 +2,7 @@
 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
-
+  
   Scenario: Get help for Portuguese language
     When I run cucumber --i18n pt help
     Then it should pass with
@@ -24,6 +24,7 @@ Feature: Language help
             | but (code)       | "Mas"                                                                                        |
 
       """
+
   Scenario: List languages
     When I run cucumber --i18n help
     Then STDERR should be empty
@@ -51,6 +52,7 @@ Feature: Language help
             | fa        | Persian             | فارسی             |
             | fi        | Finnish             | suomi             |
             | fr        | French              | français          |
+            | gl        | Galician            | galego            |
             | he        | Hebrew              | עברית             |
             | hi        | Hindi               | हिंदी             |
             | hr        | Croatian            | hrvatski          |

data/legacy_features/report_called_undefined_steps.feature

@@ -18,6 +18,7 @@ Feature: Cucumber command line
           Given call step "a step definition that calls an undefined step" # features/step_definitions/sample_steps.rb:23
             Undefined step: "this does not exist" (Cucumber::Undefined)
             ./features/step_definitions/sample_steps.rb:19:in `/^a step definition that calls an undefined step$/'
+            ./features/step_definitions/sample_steps.rb:24:in `/^call step "(.*)"$/'
             features/call_undefined_step_from_step_def.feature:7:in `Given call step "a step definition that calls an undefined step"'
 
       2 scenarios (2 undefined)

data/legacy_features/snippets_when_using_star_keyword.feature

@@ -3,6 +3,7 @@ Feature: Use * keywords and still get snippets
   Given/When/Then, I should not get an exception
   when I have undefined steps
 
+  @wip-jruby
   Scenario: Use some *
     Given a standard Cucumber project directory structure
     And a file named "features/f.feature" with:

data/legacy_features/support/env.rb

@@ -109,6 +109,10 @@ class CucumberWorld
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
+    if Cucumber::JRUBY
+      # TODO: this actually a workaround for cucumber/gherkin#238
+      @last_stderr.gsub!(/^.*java_package_module_template.rb:\d+ warning: `eval' should not be aliased.*\n/, '')
+    end
   end
 
   def run_spork_in_background(port = nil)

data/lib/cucumber/ast/background.rb

@@ -1,52 +1,54 @@
 require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
+require 'cucumber/ast/location'
 
 module Cucumber
   module Ast
     class Background #:nodoc:
       include HasSteps
       include Names
-      attr_reader :feature_elements
+      include HasLocation
+      attr_accessor :feature
 
-      def initialize(comment, line, keyword, title, description, raw_steps)
-        @comment, @line, @keyword, @title, @description, @raw_steps = comment, line, keyword, title, description, raw_steps
-        @feature_elements = []
+      def initialize(language, location, comment, keyword, title, description, raw_steps)
+        @language, @location, @comment, @keyword, @title, @description, @raw_steps = language, location, comment, keyword, title, description, raw_steps
+        @failed = nil
+        @first_collection_created = false
+        attach_steps(@raw_steps)
       end
 
-      def init
-        return if @steps
-        attach_steps(@raw_steps)
-        @steps = StepCollection.new(@raw_steps)
-        @step_invocations = @steps.step_invocations(true)
+      def feature_elements
+        feature.feature_elements
       end
 
-      def step_collection(step_invocations)
-        init
-        unless((defined? @first_collection_created) and @first_collection_created)
-          @first_collection_created = true
-          @step_invocations.dup(step_invocations)
+      def step_invocations
+        @step_invocations ||= steps.step_invocations(true)
+      end
+
+      def step_collection(scenario_step_invocations)
+        if(@first_collection_created)
+          steps.step_invocations(true).dup(scenario_step_invocations)
         else
-          @steps.step_invocations(true).dup(step_invocations)
+          @first_collection_created = true
+          step_invocations.dup(scenario_step_invocations)
         end
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        init
         visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_background_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
+        visitor.visit_background_name(@keyword, name, file_colon_line, source_indent(first_line_length))
         with_visitor(hook_context, visitor) do
           visitor.runtime.before(hook_context)
           skip_invoke! if failed?
-          visitor.visit_steps(@step_invocations)
-          @failed = @step_invocations.detect{|step_invocation| step_invocation.exception || step_invocation.status != :passed }
-          visitor.runtime.after(hook_context) if @failed || @feature_elements.empty?
+          visitor.visit_steps(step_invocations)
+          @failed = step_invocations.any? { |step_invocation| step_invocation.exception || step_invocation.status != :passed }
+          visitor.runtime.after(hook_context) if @failed || feature_elements.empty?
         end
       end
 
       def with_visitor(scenario, visitor)
         @current_visitor = visitor
-        init
         if self != scenario && scenario.respond_to?(:with_visitor)
           scenario.with_visitor(visitor) do
             yield
@@ -57,39 +59,32 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        init
         if hook_context != self
           hook_context.accept_hook?(hook)
         else
           # We have no scenarios, just ask our feature
-          @feature.accept_hook?(hook)
+          feature.accept_hook?(hook)
         end
       end
 
       def skip_invoke!
-        @step_invocations.each{|step_invocation| step_invocation.skip_invoke!}
+        step_invocations.each{|step_invocation| step_invocation.skip_invoke!}
       end
 
       def failed?
-        if defined? @failed
-          return @failed
-        else
-          return nil
-        end
+        !!@failed
       end
 
       def hook_context
-        @feature_elements.first || self
+        feature_elements.first || self
       end
 
       def to_sexp
-        init
-        sexp = [:background, @line, @keyword]
+        sexp = [:background, line, @keyword]
         sexp += [name] unless name.empty?
         comment = @comment.to_sexp
         sexp += [comment] if comment
-        steps = @steps.to_sexp
-        sexp += steps if steps.any?
+        sexp += steps.to_sexp if steps.any?
         sexp
       end
 
@@ -99,7 +94,6 @@ module Cucumber
         @current_visitor.visit_exception(@exception, :failed)
       end
 
-
       # Override this method, as there are situations where the background
       # wind up being the one called fore Before scenarios, and
       # backgrounds don't have tags.
@@ -111,6 +105,12 @@ module Cucumber
         source_tags.map { |tag| tag.name }
       end
 
+      private
+
+      def steps
+        @steps ||= StepCollection.new(@raw_steps)
+      end
+
     end
   end
 end

data/lib/cucumber/ast/empty_background.rb

@@ -0,0 +1,33 @@
+require 'cucumber/ast/step_collection'
+
+module Cucumber
+  module Ast
+    class EmptyBackground
+      attr_writer :file
+      attr_accessor :feature
+
+      def failed?
+        false
+      end
+
+      def feature_elements
+        []
+      end
+
+      def step_collection(step_invocations)
+        StepCollection.new(step_invocations)
+      end
+
+      def step_invocations
+        []
+      end
+
+      def init
+      end
+
+      def accept(visitor)
+      end
+    end
+  end
+end
+

data/lib/cucumber/ast/examples.rb

@@ -4,10 +4,13 @@ module Cucumber
   module Ast
     class Examples #:nodoc:
       include Names
+      include HasLocation
       attr_writer :outline_table
 
-      def initialize(comment, line, keyword, title, description, outline_table)
-        @comment, @keyword, @title, @description, @outline_table = comment, keyword, title, description, outline_table
+      def initialize(location, comment, keyword, title, description, outline_table)
+        @location, @comment, @keyword, @title, @description, @outline_table = location, comment, keyword, title, description, outline_table
+        raise ArgumentError unless @location.is_a?(Location)
+        raise ArgumentError unless @comment.is_a?(Comment)
       end
 
       attr_reader :gherkin_statement

data/lib/cucumber/ast/feature.rb

@@ -1,17 +1,22 @@
 require 'cucumber/ast/names'
+require 'cucumber/ast/location'
+require 'cucumber/ast/location'
 
 module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
       include Names
+      include HasLocation
 
       attr_accessor :language
-      attr_writer :features, :background
-      attr_reader :file, :feature_elements
+      attr_reader :feature_elements
 
-      def initialize(background, comment, tags, keyword, title, description, feature_elements)
+      def initialize(location, background, comment, tags, keyword, title, description, feature_elements)
         @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements
+        @background.feature = self
+        @location = location
+        @feature_elements.each { |e| e.feature = self }
       end
 
       attr_reader :gherkin_statement
@@ -19,26 +24,16 @@ module Cucumber
         @gherkin_statement ||= statement
       end
 
-      def init
-        @background.feature = self if @background
-        @background.init if @background
-        @feature_elements.each do |feature_element|
-          feature_element.init
-          feature_element.feature = self
-        end
-      end
-
-      def add_feature_element(feature_element)
-        @feature_elements << feature_element
+      def step_count
+        units.inject(0) { |total, unit| total += unit.step_count }
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        init
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@keyword, indented_name)
-        visitor.visit_background(@background) if @background
+        visitor.visit_background(@background) if !@background.is_a?(EmptyBackground)
         @feature_elements.each do |feature_element|
           visitor.visit_feature_element(feature_element)
         end
@@ -65,24 +60,8 @@ module Cucumber
         @tags.accept_hook?(hook)
       end
 
-      def next_feature_element(feature_element, &proc)
-        init
-        index = @feature_elements.index(feature_element)
-        next_one = @feature_elements[index+1]
-        proc.call(next_one) if next_one
-      end
-
       def backtrace_line(step_name, line)
-        "#{file_colon_line(line)}:in `#{step_name}'"
-      end
-
-      def file=(file)
-        file = file.gsub(/\//, '\\') if Cucumber::WINDOWS && file && !ENV['CUCUMBER_FORWARD_SLASH_PATHS']
-        @file = file
-      end
-
-      def file_colon_line(line)
-        "#{@file}:#{line}"
+        "#{location.on_line(line)}:in `#{step_name}'"
       end
 
       def short_name
@@ -95,8 +74,7 @@ module Cucumber
       end
 
       def to_sexp
-        init
-        sexp = [:feature, @file, name]
+        sexp = [:feature, file, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp
@@ -105,6 +83,17 @@ module Cucumber
         sexp += @feature_elements.map{|fe| fe.to_sexp}
         sexp
       end
+
+      private
+
+      attr_reader :background
+
+      def units
+        @units ||= @feature_elements.map do |element| 
+          element.to_units(background)
+        end.flatten
+      end
+
     end
   end
 end