cucumber 0.6.2 → 0.6.3

data/spec/cucumber/ast/feature_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast/feature_factory'
 
 module Cucumber
@@ -7,11 +7,11 @@ module Cucumber
       include FeatureFactory
 
       it "should convert to sexp" do
-        step_mother = StepMother.new
+        step_mother = Cucumber::StepMother.new
         step_mother.load_natural_language('en')
         step_mother.load_programming_language('rb')
         dsl = Object.new 
-        dsl.extend RbSupport::RbDsl
+        dsl.extend Cucumber::RbSupport::RbDsl
 
         feature = create_feature(dsl)
         if Cucumber::WINDOWS
@@ -46,11 +46,11 @@ module Cucumber
       end
 
       it "should store OS specific file paths" do
-        step_mother = StepMother.new
+        step_mother = Cucumber::StepMother.new
         step_mother.load_natural_language('en')
         step_mother.load_programming_language('rb')
         dsl = Object.new 
-        dsl.extend RbSupport::RbDsl
+        dsl.extend Cucumber::RbSupport::RbDsl
         feature = create_feature(dsl)
 
         if Cucumber::WINDOWS

data/spec/cucumber/ast/outline_table_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module Cucumber::Ast
   describe OutlineTable do

data/spec/cucumber/ast/py_string_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast/py_string'
 
 module Cucumber

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/core_ext/string'
@@ -8,11 +8,11 @@ module Cucumber
   module Ast
     describe ScenarioOutline do
       before do
-        @step_mother = StepMother.new
+        @step_mother = Cucumber::StepMother.new
         @step_mother.load_programming_language('rb')
         @step_mother.load_natural_language('en')
         @dsl = Object.new
-        @dsl.extend(RbSupport::RbDsl)
+        @dsl.extend(Cucumber::RbSupport::RbDsl)
 
         @dsl.Given(/^there are (\d+) cucumbers$/) do |n|
           @initial = n.to_i

data/spec/cucumber/ast/scenario_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/rb_support/rb_language'
@@ -7,11 +7,11 @@ module Cucumber
   module Ast
     describe Scenario do
       before do
-        @step_mother = StepMother.new
+        @step_mother = Cucumber::StepMother.new
         @step_mother.load_natural_language('en')
         @step_mother.load_programming_language('rb')
         @dsl = Object.new
-        @dsl.extend(RbSupport::RbDsl)
+        @dsl.extend(Cucumber::RbSupport::RbDsl)
 
         $x = $y = nil
         @dsl.Given /y is (\d+)/ do |n|

data/spec/cucumber/ast/step_collection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module Cucumber
   module Ast
@@ -6,8 +6,8 @@ module Cucumber
       it "should convert And to Given in snippets" do
         s1 = Step.new(1, 'Given', 'cukes')
         s2 = Step.new(2, 'And', 'turnips')
-        s1.stub!(:language).and_return(Parser::NaturalLanguage.get(nil, 'en'))
-        s2.stub!(:language).and_return(Parser::NaturalLanguage.get(nil, 'en'))
+        s1.stub!(:language).and_return(Cucumber::Parser::NaturalLanguage.get(nil, 'en'))
+        s2.stub!(:language).and_return(Cucumber::Parser::NaturalLanguage.get(nil, 'en'))
         c = StepCollection.new([s1, s2])
         actual_keywords = c.step_invocations.map{|i| i.actual_keyword}
         actual_keywords.should == %w{Given Given}

data/spec/cucumber/ast/step_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/core_ext/string'

data/spec/cucumber/ast/table_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast/table'
 
 module Cucumber
@@ -359,7 +359,7 @@ module Cucumber
             lambda { @t.dup.diff!(t, :missing_row => false) }.should_not raise_error
           end
 
-          it "should raise on surplus rows" do
+          it "should not raise on surplus rows when surplus is at the end" do
             t = table(%{
               | a | b |
               | c | d |
@@ -369,6 +369,26 @@ module Cucumber
             lambda { @t.dup.diff!(t, :surplus_row => false) }.should_not raise_error
           end
 
+          it "should not raise on surplus rows when surplus is interleaved" do
+            t1 = table(%{
+              | row_1 | row_2 |
+              | four  | 4     |
+            })
+            t2 = table(%{
+              | row_1 | row_2 |
+              | one   | 1     |
+              | two   | 2     |
+              | three | 3     |
+              | four  | 4     |
+              | five  | 5     |
+            })
+            lambda { t1.dup.diff!(t2) }.should raise_error
+
+            pending "http://groups.google.com/group/cukes/browse_thread/thread/5d96431c8245f05f" do
+              lambda { t1.dup.diff!(t2, :surplus_row => false) }.should_not raise_error
+            end
+          end
+
           it "should raise on missing columns" do
             t = table(%{
               | a |
@@ -389,7 +409,7 @@ module Cucumber
         end
 
         def table(text, file=nil, line_offset=0)
-          @table_parser ||= Parser::TableParser.new
+          @table_parser ||= Cucumber::Parser::TableParser.new
           @table_parser.parse_or_fail(text.strip, file, line_offset)
         end
       end

data/spec/cucumber/ast/tree_walker_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 module Cucumber::Ast
   describe TreeWalker do

data/spec/cucumber/broadcaster_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module Cucumber
   describe Broadcaster do

data/spec/cucumber/cli/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber
@@ -54,14 +54,14 @@ module Cli
     end
 
     it "should require files in vendor/{plugins,gems}/*/cucumber/*.rb" do
-      given_the_following_files("/vendor/plugins/plugin_a/cucumber/foo.rb",
-                                "/vendor/gems/gem_a/cucumber/bar.rb")
+      given_the_following_files("/vendor/gems/gem_a/cucumber/bar.rb", 
+                                "/vendor/plugins/plugin_a/cucumber/foo.rb")
 
       config.parse!(%w{--require /features})
 
       config.step_defs_to_load.should == [
-        "/vendor/plugins/plugin_a/cucumber/foo.rb",
-        "/vendor/gems/gem_a/cucumber/bar.rb"
+        "/vendor/gems/gem_a/cucumber/bar.rb",
+        "/vendor/plugins/plugin_a/cucumber/foo.rb"
       ]
     end
 
@@ -139,7 +139,7 @@ module Cli
         config.parse!([])
         config.options[:require].should == ['from/yml']
       end
-      
+
       it "parses ERB syntax in the cucumber.yml file" do
         given_cucumber_yml_defined_as({'default' => '<%="--require some_file"%>'})
 
@@ -147,6 +147,16 @@ module Cli
         config.options[:require].should include('some_file')
       end
 
+      it "parses ERB in cucumber.yml that makes uses nested ERB sessions" do
+        given_cucumber_yml_defined_as(<<ERB_YML)
+<%= ERB.new({'standard' => '--require some_file'}.to_yaml).result %>
+<%= ERB.new({'enhanced' => '--require other_file'}.to_yaml).result %>
+ERB_YML
+
+        config.parse!(%w(-p standard))
+        config.options[:require].should include('some_file')
+      end
+
       it "provides a helpful error message when a specified profile does not exists in cucumber.yml" do
         given_cucumber_yml_defined_as({'default' => '--require from/yml', 'html_report' =>  '--format html'})
 

data/spec/cucumber/cli/drb_client_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 
 module Cucumber

data/spec/cucumber/cli/main_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 begin
   require 'spec/runner/differs/default' # RSpec >=1.2.4
@@ -20,16 +20,16 @@ module Cucumber
       describe "verbose mode" do
 
         before(:each) do
-          @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
+          @empty_feature = Cucumber::Ast::Feature.new(nil, Cucumber::Ast::Comment.new(''), Cucumber::Ast::Tags.new(2, []), "Feature", [])
         end
 
         it "should show feature files parsed" do
           @cli = Main.new(%w{--verbose example.feature}, @out)
           @cli.stub!(:require)
 
-          FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature))
+          Cucumber::FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature))
 
-          @cli.execute!(StepMother.new)
+          @cli.execute!(Cucumber::StepMother.new)
 
           @out.string.should include('example.feature')
         end
@@ -80,7 +80,7 @@ module Cucumber
             Object.should_receive(:const_get).with('ZooModule').and_return(mock_module)
             mock_module.should_receive(:const_get).with('MonkeyFormatterClass').and_return(mock('formatter class', :new => f))
 
-            cli.execute!(StepMother.new)
+            cli.execute!(Cucumber::StepMother.new)
           end
 
         end
@@ -116,18 +116,17 @@ module Cucumber
         
       end
       
-    [ProfilesNotDefinedError, YmlLoadError, ProfileNotFound].each do |exception_klass|
+      [ProfilesNotDefinedError, YmlLoadError, ProfileNotFound].each do |exception_klass|
 
-      it "rescues #{exception_klass}, prints the message to the error stream and returns true" do
-        Configuration.stub!(:new).and_return(configuration = mock('configuration'))
-        configuration.stub!(:parse!).and_raise(exception_klass.new("error message"))
+        it "rescues #{exception_klass}, prints the message to the error stream and returns true" do
+          Configuration.stub!(:new).and_return(configuration = mock('configuration'))
+          configuration.stub!(:parse!).and_raise(exception_klass.new("error message"))
 
-        main = Main.new('', out = StringIO.new, error = StringIO.new)
-        main.execute!(StepMother.new).should be_true
-        error.string.should == "error message\n"
+          main = Main.new('', out = StringIO.new, error = StringIO.new)
+          main.execute!(Cucumber::StepMother.new).should be_true
+          error.string.should == "error message\n"
+        end
       end
-    end
-
 
       context "--drb" do
         before(:each) do

data/spec/cucumber/cli/options_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber

data/spec/cucumber/cli/profile_loader_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber

data/spec/cucumber/core_ext/proc_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/core_ext/proc'
 
 describe Proc do

data/spec/cucumber/formatter/ansicolor_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/ansicolor'
 
 module Cucumber

data/spec/cucumber/formatter/color_io_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/color_io'
 
 module Cucumber

data/spec/cucumber/formatter/duration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/duration'
 
 module Cucumber

data/spec/cucumber/formatter/html_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'cucumber/formatter/html'
 require 'nokogiri'
 require 'cucumber/rb_support/rb_language'

data/spec/cucumber/formatter/junit_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'cucumber/formatter/junit'
 require 'nokogiri'

data/spec/cucumber/formatter/progress_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/progress'
 
 module Cucumber
@@ -8,8 +8,8 @@ module Cucumber
       before(:each) do
         Term::ANSIColor.coloring = false
         @out = StringIO.new
-        progress = Progress.new(mock("step mother"), @out, {})
-        @visitor = Ast::TreeWalker.new(nil, [progress])
+        progress = Cucumber::Formatter::Progress.new(mock("step mother"), @out, {})
+        @visitor = Cucumber::Ast::TreeWalker.new(nil, [progress])
       end
  
       describe "visiting a table cell value without a status" do

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -1,12 +1,12 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/parser/natural_language'
 
 module Cucumber
   module Parser
     describe Feature do
       before do
-        @step_mother = StepMother.new
-        @parser = NaturalLanguage.get(@step_mother, 'en').parser
+        @step_mother = Cucumber::StepMother.new
+        @parser = Cucumber::Parser::NaturalLanguage.get(@step_mother, 'en').parser
       end
 
       after do
@@ -18,11 +18,11 @@ module Cucumber
       end
 
       def parse_file(file)
-        FeatureFile.new(File.dirname(__FILE__) + "/../treetop_parser/" + file).parse(@step_mother, {})
+        Cucumber::FeatureFile.new(File.dirname(__FILE__) + "/../treetop_parser/" + file).parse(@step_mother, {})
       end
 
       def parse_example_file(file)
-        FeatureFile.new(File.dirname(__FILE__) + "/../../../examples/" + file).parse(@step_mother, {})
+        Cucumber::FeatureFile.new(File.dirname(__FILE__) + "/../../../examples/" + file).parse(@step_mother, {})
       end
 
       describe "Comments" do

data/spec/cucumber/parser/table_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'treetop'
 require 'cucumber/parser'
 
@@ -6,7 +6,7 @@ module Cucumber
   module Parser
     describe 'Tables' do
       before do
-        @parser = NaturalLanguage.get(StepMother.new, 'en').parser
+        @parser = NaturalLanguage.get(Cucumber::StepMother.new, 'en').parser
       end
       
       after do
@@ -14,7 +14,7 @@ module Cucumber
       end
 
       def parse(text)
-        @parser.__send__(:prepare_to_parse, text)
+        @parser.prepare_to_parse(text)
         @parser.root = :table
         table = @parser._nt_table
         table.raw

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require 'cucumber/ast'
 require 'cucumber/step_mother'
@@ -8,11 +8,11 @@ module Cucumber
   module RbSupport
     describe RbStepDefinition do
       before do      
-        @step_mother = StepMother.new
+        @step_mother = Cucumber::StepMother.new
         @step_mother.load_natural_language('en')
         @rb = @step_mother.load_programming_language('rb')
         @dsl = Object.new 
-        @dsl.extend RbSupport::RbDsl
+        @dsl.extend Cucumber::RbSupport::RbDsl
         @step_mother.before(mock('scenario', :null_object => true))
 
         $inside = nil
@@ -32,7 +32,7 @@ module Cucumber
 
       it "should allow calling of other steps with inline arg" do
         @dsl.Given /Outside/ do
-          Given "Inside", Ast::Table.new([['inside']])
+          Given "Inside", Cucumber::Ast::Table.new([['inside']])
         end
         @dsl.Given /Inside/ do |table|
           $inside = table.raw[0][0]
@@ -49,7 +49,7 @@ module Cucumber
 
         lambda do
           @step_mother.step_match('Outside').invoke(nil)
-        end.should raise_error(Undefined, 'Undefined step: "Inside"')
+        end.should raise_error(Cucumber::Undefined, 'Undefined step: "Inside"')
       end
 
       it "should allow forced pending" do
@@ -59,7 +59,7 @@ module Cucumber
 
         lambda do
           @step_mother.step_match("Outside").invoke(nil)
-        end.should raise_error(Pending, "Do me!")
+        end.should raise_error(Cucumber::Pending, "Do me!")
       end
 
       it "should raise ArityMismatchError when the number of capture groups differs from the number of step arguments" do
@@ -68,7 +68,7 @@ module Cucumber
 
         lambda do
           @step_mother.step_match("No group: arg").invoke(nil)
-        end.should raise_error(ArityMismatchError)
+        end.should raise_error(Cucumber::ArityMismatchError)
       end
 
       it "should allow announce" do