cucumber 0.8.6 → 0.8.7

data/lib/cucumber/wire_support/configuration.rb

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

data/lib/cucumber/wire_support/wire_language.rb

@@ -1,5 +1,12 @@
 require 'socket'
-require 'json'
+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 'cucumber/wire_support/connection'
 require 'cucumber/wire_support/configuration'
 require 'cucumber/wire_support/wire_packet'
@@ -26,9 +33,9 @@ module Cucumber
         @connections << Connection.new(config)
       end
       
-      def snippet_text(code_keyword, step_name, multiline_arg_class)
+      def snippet_text(step_keyword, step_name, multiline_arg_class)
         snippets = @connections.map do |remote| 
-          remote.snippet_text(code_keyword, step_name, multiline_arg_class.to_s)
+          remote.snippet_text(step_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 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast'
 require 'cucumber/rb_support/rb_language'
 
@@ -8,8 +8,8 @@ module Cucumber
 
       before do
         extend(Cucumber::RbSupport::RbDsl)
-        @runtime = Cucumber::Runtime.new
-        @rb = @runtime.load_programming_language('rb')
+        @step_mother = Cucumber::StepMother.new
+        @rb = @step_mother.load_programming_language('rb')
 
         $x = $y = nil
         Before do
@@ -19,7 +19,7 @@ module Cucumber
           $y = $x * n.to_i
         end
 
-        @visitor = TreeWalker.new(@runtime)
+        @visitor = TreeWalker.new(@step_mother)
 
         @feature = mock('feature', :visit? => true).as_null_object
       end
@@ -29,8 +29,7 @@ module Cucumber
           comment=Comment.new(''),
           line=2,
           keyword="", 
-          title="",
-          description="",
+          name="",
           steps=[
             Step.new(7, "Given", "y is 5")
           ])
@@ -41,8 +40,7 @@ module Cucumber
           tags=Tags.new(98,[]),
           line=99,
           keyword="", 
-          title="",
-          description="",
+          name="", 
           steps=[]
         )
         background.feature = @feature
@@ -50,66 +48,6 @@ 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}
         ])
-        doc_string = Ast::DocString.new(%{\n I like\nCucumber sandwich\n})
+        py_string = Ast::PyString.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,16 +38,15 @@ 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:", doc_string),
+              Step.new(11, "Given", "a happy step with an inline arg:", py_string),
               Step.new(12, "Given", "a failing step")
             ]
           )]

data/spec/cucumber/ast/feature_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../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::Runtime.new
+        step_mother = Cucumber::StepMother.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:", 
-              [:doc_string, "\n I like\nCucumber sandwich\n"]], 
+              [:py_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::Runtime.new
+        step_mother = Cucumber::StepMother.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 '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

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'cucumber/ast/py_string'
+
+module Cucumber
+  module Ast
+    describe PyString do
+      describe "replacing arguments" do
+
+        before(:each) do
+          @ps = PyString.new("<book>\n<qty>\n")
+        end
+      
+        it "should return a new py_string with arguments replaced with values" do
+          py_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere', '<qty>' => '5'})
+                
+          py_string_with_replaced_arg.to_step_definition_arg.should == "Life is elsewhere\n5\n"
+        end
+        
+        it "should not change the original py_string" do
+          py_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere'})
+          
+          @ps.to_s.should_not include("Life is elsewhere")
+        end
+
+        it "should replaced nil with empty string" do
+          ps = PyString.new("'<book>'")
+          py_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
+          
+          py_string_with_replaced_arg.to_step_definition_arg.should == "''"
+        end
+
+        it "should recognise when just a subset of a cell is delimited" do
+          @ps.should have_text('<qty>')
+        end
+
+      end
+      
+    end
+  end
+end

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../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::Runtime.new
+        @step_mother = Cucumber::StepMother.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,19 +40,15 @@ module Cucumber
           ],
           [
             [
+              Comment.new("#Mmmm... cucumbers\n"),
+              24,
+              'Examples:',
+              'First table',
               [
-                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)
+                %w{start eat left},
+                %w{12 5 7},
+                %w{20 6 14}
+              ]
             ]
           ]
 

data/spec/cucumber/ast/scenario_spec.rb

@@ -1,4 +1,4 @@
-require '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,7 +7,7 @@ module Cucumber
   module Ast
     describe Scenario do
       before do
-        @step_mother = Cucumber::Runtime.new
+        @step_mother = Cucumber::StepMother.new
         @step_mother.load_programming_language('rb')
         @dsl = Object.new
         @dsl.extend(Cucumber::RbSupport::RbDsl)
@@ -17,6 +17,7 @@ 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
@@ -26,8 +27,7 @@ module Cucumber
           tags=Tags.new(98, []), 
           line=99,
           keyword="",
-          title="",
-          description="",
+          name="", 
           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 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../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
-        doc_string = DocString.new('taste_<taste> color_<color>')
+        py_string = PyString.new('taste_<taste> color_<color>')
 
-        step = Step.new(1, 'Given', 'a <color> cucumber', doc_string)
+        step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
 
         invocation_table = Table.new([
           %w{color taste},

data/spec/cucumber/ast/table_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/ast/table'
 
 module Cucumber
@@ -45,26 +45,11 @@ module Cucumber
         @table.hashes.first[:one].should == '4444'
       end
 
-      it "should allow mapping columns" do
+      it "should allow map'ing 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 }
@@ -77,10 +62,6 @@ 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([
@@ -354,23 +335,6 @@ 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 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../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 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module Cucumber
   describe Broadcaster do