cucumber 0.8.5 → 0.8.6

data/lib/cucumber/wire_support/configuration.rb

@@ -1,10 +1,13 @@
+require 'yaml'
+require 'erb'
+
 module Cucumber
   module WireSupport
     class Configuration
       attr_reader :host, :port
       
       def initialize(wire_file)
-        params = YAML.load_file(wire_file)
+        params = YAML.load(ERB.new(File.read(wire_file)).result)
         @host = params['host']
         @port = params['port']
         @timeouts = default_timeouts.merge(params['timeout'] || {})

data/lib/cucumber/wire_support/wire_language.rb

@@ -1,12 +1,5 @@
 require 'socket'
-begin
-  require 'json'
-rescue LoadError
-  STDERR.puts <<-EOM
-You must gem install #{defined?(JRUBY_VERSION) ? 'json_pure' : 'json'} before you can use the wire support.
-EOM
-  exit(1)
-end
+require 'json'
 require 'cucumber/wire_support/connection'
 require 'cucumber/wire_support/configuration'
 require 'cucumber/wire_support/wire_packet'
@@ -33,9 +26,9 @@ module Cucumber
         @connections << Connection.new(config)
       end
       
-      def snippet_text(step_keyword, step_name, multiline_arg_class)
+      def snippet_text(code_keyword, step_name, multiline_arg_class)
         snippets = @connections.map do |remote| 
-          remote.snippet_text(step_keyword, step_name, multiline_arg_class.to_s)
+          remote.snippet_text(code_keyword, step_name, multiline_arg_class.to_s)
         end
         snippets.flatten.join("\n")
       end

data/spec/cucumber/ast/background_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/ast'
 require 'cucumber/rb_support/rb_language'
 
@@ -8,8 +8,8 @@ module Cucumber
 
       before do
         extend(Cucumber::RbSupport::RbDsl)
-        @step_mother = Cucumber::StepMother.new
-        @rb = @step_mother.load_programming_language('rb')
+        @runtime = Cucumber::Runtime.new
+        @rb = @runtime.load_programming_language('rb')
 
         $x = $y = nil
         Before do
@@ -19,7 +19,7 @@ module Cucumber
           $y = $x * n.to_i
         end
 
-        @visitor = TreeWalker.new(@step_mother)
+        @visitor = TreeWalker.new(@runtime)
 
         @feature = mock('feature', :visit? => true).as_null_object
       end
@@ -29,7 +29,8 @@ module Cucumber
           comment=Comment.new(''),
           line=2,
           keyword="", 
-          name="",
+          title="",
+          description="",
           steps=[
             Step.new(7, "Given", "y is 5")
           ])
@@ -40,7 +41,8 @@ module Cucumber
           tags=Tags.new(98,[]),
           line=99,
           keyword="", 
-          name="", 
+          title="",
+          description="",
           steps=[]
         )
         background.feature = @feature
@@ -48,6 +50,66 @@ module Cucumber
         $x.should == 2
         $y.should == 10
       end
+
+      describe "should respond to #name" do
+        it "with a value" do
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            title="background name",
+            description="",
+            steps=[])
+          lambda{ background.name }.should_not raise_error
+          background.name.should == 'background name'
+        end
+        it "without a value" do
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            title="",
+            description="",
+            steps=[])
+        lambda{ background.name }.should_not raise_error
+        end
+      end
+
+      describe "failures in a Before hook" do
+
+        before do
+          Before do
+            raise Exception, "Exception from Before hook"
+          end
+        end
+
+        it "should state that the background has failed" do
+          # Assign
+          background = Background.new(
+            comment=Comment.new(''),
+            line=2,
+            keyword="",
+            title="",
+            description="",
+            steps=[
+              Step.new(7, "Given", "y is 5")
+            ])
+          background.feature = @feature
+
+          # Expect
+          @visitor.should_receive( :visit_exception ) do |exception, status|
+            exception.should be_instance_of( Exception )
+            exception.message.should == "Exception from Before hook"
+            status.should == :failed
+           end
+
+          # Assert
+          lambda{ @visitor.visit_background(background) }.should_not raise_error
+          background.should be_failed
+        end
+
+      end
     end
+    
   end
 end

data/spec/cucumber/ast/feature_factory.rb

@@ -24,9 +24,9 @@ module Cucumber
           %w{1 22 333},
           %w{4444 55555 666666}
         ])
-        py_string = Ast::PyString.new(%{\n I like\nCucumber sandwich\n})
+        doc_string = Ast::DocString.new(%{\n I like\nCucumber sandwich\n})
         
-        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
+        background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "", "",
           [
             Step.new(3, "Given", "a passing step")
           ]
@@ -38,15 +38,16 @@ module Cucumber
           Ast::Tags.new(6, ['one', 'two']),
           "Feature",
           "Pretty printing",
+          "",
           [Ast::Scenario.new(
             background,
             Ast::Comment.new("    # My scenario comment  \n# On two lines \n"),
             Ast::Tags.new(8, ['three', 'four']),
             9,
-            "Scenario:", "A Scenario",
+            "Scenario:", "A Scenario", "",
             [
               Step.new(10, "Given", "a passing step with an inline arg:", table),
-              Step.new(11, "Given", "a happy step with an inline arg:", py_string),
+              Step.new(11, "Given", "a happy step with an inline arg:", doc_string),
               Step.new(12, "Given", "a failing step")
             ]
           )]

data/spec/cucumber/ast/feature_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/ast/feature_factory'
 
 module Cucumber
@@ -7,7 +7,7 @@ module Cucumber
       include FeatureFactory
 
       it "should convert to sexp" do
-        step_mother = Cucumber::StepMother.new
+        step_mother = Cucumber::Runtime.new
         step_mother.load_programming_language('rb')
         dsl = Object.new 
         dsl.extend Cucumber::RbSupport::RbDsl
@@ -40,12 +40,12 @@ module Cucumber
                 [:row, -1,
                   [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
             [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
-              [:py_string, "\n I like\nCucumber sandwich\n"]], 
+              [:doc_string, "\n I like\nCucumber sandwich\n"]], 
             [:step_invocation, 12, "Given", "a failing step"]]]          
       end
 
       it "should store OS specific file paths" do
-        step_mother = Cucumber::StepMother.new
+        step_mother = Cucumber::Runtime.new
         step_mother.load_programming_language('rb')
         dsl = Object.new 
         dsl.extend Cucumber::RbSupport::RbDsl

data/spec/cucumber/ast/outline_table_spec.rb

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

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/core_ext/string'
@@ -8,7 +8,7 @@ module Cucumber
   module Ast
     describe ScenarioOutline do
       before do
-        @step_mother = Cucumber::StepMother.new
+        @step_mother = Cucumber::Runtime.new
         @step_mother.load_programming_language('rb')
         @dsl = Object.new
         @dsl.extend(Cucumber::RbSupport::RbDsl)
@@ -31,7 +31,7 @@ module Cucumber
           Comment.new(""),
           Tags.new(18, []),
           19,
-          "Scenario:", "My outline",
+          "Scenario:", "My outline", "",
           [
             Step.new(20, 'Given', 'there are <start> cucumbers'),
             Step.new(21, 'When',  'I eat <eat> cucumbers'),
@@ -40,15 +40,19 @@ module Cucumber
           ],
           [
             [
-              Comment.new("#Mmmm... cucumbers\n"),
-              24,
-              'Examples:',
-              'First table',
               [
-                %w{start eat left},
-                %w{12 5 7},
-                %w{20 6 14}
-              ]
+                Comment.new("#Mmmm... cucumbers\n"),
+                24,
+                'Examples:',
+                'First table',
+                '',
+                [
+                  %w{start eat left},
+                  %w{12 5 7},
+                  %w{20 6 14}
+                ]
+              ],
+              Gherkin::Formatter::Model::Examples.new(nil, nil, nil, nil, nil, nil)
             ]
           ]
 

data/spec/cucumber/ast/scenario_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/rb_support/rb_language'
@@ -7,7 +7,7 @@ module Cucumber
   module Ast
     describe Scenario do
       before do
-        @step_mother = Cucumber::StepMother.new
+        @step_mother = Cucumber::Runtime.new
         @step_mother.load_programming_language('rb')
         @dsl = Object.new
         @dsl.extend(Cucumber::RbSupport::RbDsl)
@@ -17,7 +17,6 @@ module Cucumber
           $y = n.to_i
         end
         @visitor = TreeWalker.new(@step_mother)
-        @visitor.options = {}
       end
 
       it "should skip steps when previous is not passed" do
@@ -27,7 +26,8 @@ module Cucumber
           tags=Tags.new(98, []), 
           line=99,
           keyword="",
-          name="", 
+          title="",
+          description="",
           steps=[
             Step.new(7, "Given", "this is missing"),
             Step.new(8, "Given", "y is 5")

data/spec/cucumber/ast/step_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/step_mother'
 require 'cucumber/ast'
 require 'cucumber/core_ext/string'
@@ -48,9 +48,9 @@ module Cucumber
       end
 
       it "should replace arguments in py string arg" do
-        py_string = PyString.new('taste_<taste> color_<color>')
+        doc_string = DocString.new('taste_<taste> color_<color>')
 
-        step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
+        step = Step.new(1, 'Given', 'a <color> cucumber', doc_string)
 
         invocation_table = Table.new([
           %w{color taste},

data/spec/cucumber/ast/table_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'cucumber/ast/table'
 
 module Cucumber
@@ -45,11 +45,26 @@ module Cucumber
         @table.hashes.first[:one].should == '4444'
       end
 
-      it "should allow map'ing columns" do
+      it "should allow mapping columns" do
         @table.map_column!('one') { |v| v.to_i }
         @table.hashes.first['one'].should == 4444
       end
 
+      it "should allow mapping columns and take a symbol as the column name" do
+        @table.map_column!(:one) { |v| v.to_i }
+        @table.hashes.first['one'].should == 4444
+      end
+
+      it "should allow mapping columns and modify the rows as well" do
+        @table.map_column!(:one) { |v| v.to_i }
+        @table.rows.first.should include(4444)
+        @table.rows.first.should_not include('4444')
+      end
+
+      it "should return the row values in order" do
+        @table.rows.first.should == %w{4444 55555 666666}
+      end
+
       it "should pass silently if a mapped column does not exist in non-strict mode" do
         lambda {
           @table.map_column!('two', false) { |v| v.to_i }
@@ -62,6 +77,10 @@ module Cucumber
         }.should raise_error('The column named "two" does not exist')
       end
 
+      it "should return the table" do
+        (@table.map_column!(:one) { |v| v.to_i }).should == @table
+      end
+
       describe "#match" do
         before(:each) do
           @table = Table.new([
@@ -335,6 +354,23 @@ module Cucumber
           }
         end
 
+        it "should detect seemingly identical tables as different" do
+          t1 = Table.new([
+            ['X',  'Y'],
+            ['2', '1']
+          ])
+          t2 = Table.new([
+            ['X',  'Y'],
+            [2, 1]
+          ])
+          lambda{t1.diff!(t2)}.should raise_error
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     X       |     Y       |
+            | (-) (i) "2" | (-) (i) "1" |
+            | (+) (i) 2   | (+) (i) 1   |
+          }
+        end
+
         it "should not allow mappings that match more than 1 column" do
           t1 = Table.new([
             ['Cuke',  'Duke'],

data/spec/cucumber/ast/tree_walker_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 module Cucumber::Ast
   describe TreeWalker do
     it "should visit features" do
-      tw = TreeWalker.new(nil, [mock('listener', :before_visit_features => nil)], {})
+      tw = TreeWalker.new(nil, [mock('listener', :before_visit_features => nil)])
       tw.should_not_receive(:warn)
       tw.visit_features(mock('features', :accept => nil))
     end

data/spec/cucumber/broadcaster_spec.rb

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

data/spec/cucumber/cli/configuration_spec.rb

@@ -1,9 +1,12 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 require 'yaml'
 
 module Cucumber
 module Cli
   describe Configuration do
+    module ExposesOptions
+      attr_reader :options
+    end
 
     def given_cucumber_yml_defined_as(hash_or_string)
       File.stub!(:exist?).and_return(true)
@@ -23,7 +26,7 @@ module Cli
     end
 
     def config
-      @config ||= Configuration.new(@out = StringIO.new, @error = StringIO.new)
+      @config ||= Configuration.new(@out = StringIO.new, @error = StringIO.new).extend(ExposesOptions)
     end
 
     def reset_config
@@ -287,17 +290,17 @@ END_OF_MESSAGE
 
     it "should accept --out option" do
       config.parse!(%w{--out jalla.txt})
-      config.options[:formats].should == [['pretty', 'jalla.txt']]
+      config.formats.should == [['pretty', 'jalla.txt']]
     end
 
     it "should accept multiple --out options" do
       config.parse!(%w{--format progress --out file1 --out file2})
-      config.options[:formats].should == [['progress', 'file2']]
+      config.formats.should == [['progress', 'file2']]
     end
 
     it "should accept multiple --format options and put the STDOUT one first so progress is seen" do
       config.parse!(%w{--format pretty --out pretty.txt --format progress})
-      config.options[:formats].should == [['progress', out], ['pretty', 'pretty.txt']]
+      config.formats.should == [['progress', out], ['pretty', 'pretty.txt']]
     end
 
     it "should not accept multiple --format options when both use implicit STDOUT" do
@@ -314,7 +317,7 @@ END_OF_MESSAGE
 
     it "should associate --out to previous --format" do
       config.parse!(%w{--format progress --out file1 --format profile --out file2})
-      config.options[:formats].should == [["progress", "file1"], ["profile" ,"file2"]]
+      config.formats.should == [["progress", "file1"], ["profile" ,"file2"]]
     end
 
     it "should accept --color option" do
@@ -399,7 +402,30 @@ END_OF_MESSAGE
       ENV["RAILS_ENV"].should == "selenium"
       config.feature_files.should_not include('RAILS_ENV=selenium')
     end
+    
+    describe "#tag_expression" do
+      it "returns an empty expression when no tags are specified" do
+        config.parse!([])
+        config.tag_expression.should be_empty
+      end
 
+      it "returns an expression when tags are specified" do
+        config.parse!(['--tags','@foo'])
+        config.tag_expression.should_not be_empty
+      end
+    end
+    
+    describe "#dry_run?" do
+      it "returns true when --dry-run was specified on in the arguments" do
+        config.parse!(['--dry-run'])
+        config.dry_run?.should be_true
+      end
+      
+      it "returns false by default" do
+        config.parse!([])
+        config.dry_run?.should be_false
+      end
+    end
   end
 end
 end