cucumber 0.1.6 → 0.1.7

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/cucumber/cli_spec.rb

@@ -9,12 +9,13 @@ module Cucumber
       cucumber_yml = {'bongo' => '--require from/yml'}.to_yaml
       IO.should_receive(:read).with('cucumber.yml').and_return(cucumber_yml)
 
-      cli.parse_options!(%w{--format pretty --profile bongo})
+      cli.parse_options!(%w{--format progress --profile bongo})
       cli.options.should == {
-        :format => 'pretty',
+        :format => 'progress',
         :require => ['from/yml'], 
         :dry_run => false, 
-        :lang => 'en'
+        :lang => 'en',
+        :source => true
       }
     end
 
@@ -29,8 +30,17 @@ module Cucumber
         :format => 'pretty',
         :require => ['from/yml'], 
         :dry_run => false, 
-        :lang => 'en'
+        :lang => 'en',
+        :source => true
       }
     end
+    
+    it "should accept source option" do
+      cli = CLI.new
+      cli.parse_options!(%w{--no-source})
+      
+      cli.options[:source].should be_false
+    end
+        
   end
 end

data/spec/cucumber/executor_spec.rb

@@ -5,9 +5,10 @@ module Cucumber
   describe Executor do
     before do # TODO: Way more setup and duplication of lib code. Use lib code!
       @io = StringIO.new
-      @formatter = Formatters::ProgressFormatter.new(@io)
       @step_mother = StepMother.new
-      @executor = Executor.new(@formatter, @step_mother)
+      @executor = Executor.new(@step_mother)
+      @formatter = Formatters::ProgressFormatter.new(@io)
+      @executor.formatter = @formatter
       @feature_file = File.dirname(__FILE__) + '/sell_cucumbers.feature'
       @parser = TreetopParser::FeatureParser.new
       @features = Tree::Features.new
@@ -37,7 +38,7 @@ STDOUT
 
 1)
 dang
-#{__FILE__}:33:in `Then /I should owe (\\d*) cucumbers/'
+#{__FILE__}:34:in `Then /I should owe (\\d*) cucumbers/'
 #{@feature_file}:9:in `Then I should owe 7 cucumbers'
 \e[0m
 STDOUT

data/spec/cucumber/formatters/ansicolor_spec.rb

@@ -13,6 +13,10 @@ module Cucumber
       it "should return bold green without wrapping for #passed without arg" do
         passed.should == "\e[0m\e[1m\e[32m"
       end
+
+      it "should return grey for #comment" do
+        comment("foo").should == "\e[0m\e[90mfoo\e[0m"
+      end
       
       it "should not generate ansi codes when colors are disabled" do
         ENV['CUCUMBER_COLORS_DISABLED'] = '1'

data/spec/cucumber/formatters/pretty_formatter_spec.rb

@@ -3,15 +3,80 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Cucumber
   module Formatters
     describe PrettyFormatter do
+      
+      def mock_step(stubs={})
+        stub('step', {
+          :keyword => 'Given', 
+          :format => 'formatted yes',
+          :name => 'example',
+          :error => nil,
+          :row? => false}.merge(stubs))
+      end
+    
+      def mock_error(stubs={})
+        stub('error', {
+          :message => 'failed', 
+          :backtrace => 'example backtrace'}.merge(stubs))
+      end
+      
+      def mock_proc
+        stub(Proc, :to_comment_line => '# steps/example_steps.rb:11')
+      end
+            
       it "should print step file and line when passed" do
         io = StringIO.new
-        formatter = PrettyFormatter.new io
+        formatter = PrettyFormatter.new io, StepMother.new
         step = stub('step',
           :error => nil, :row? => false, :keyword => 'Given', :format => 'formatted yes'
         )
-        formatter.step_passed(step,nil,nil)
+        formatter.step_passed(step, nil, nil)
         io.string.should == "    Given formatted yes\n"
       end
+      
+      describe "show source option true" do
+      
+        %w{passed failed skipped}.each do |result|
+          it "should display step source for passed step" do
+            io = StringIO.new
+
+            step_mother = mock('step_mother')
+            formatter = PrettyFormatter.new io, step_mother, :source => true
+            formatter.send("step_#{result}".to_sym, mock_step(:regexp_args_proc => [nil, nil, mock_proc], :error => StandardError.new, :padding_length => 2), nil, nil)
+          
+            io.string.should include("Given formatted yes  # steps/example_steps.rb:11")
+          end
+        end
+        
+        it "should align step comments" do
+          io = StringIO.new
+          
+          step_1 = mock_step(:regexp_args_proc => [nil, nil, mock_proc], :format => "1", :padding_length => 10)
+          step_4 = mock_step(:regexp_args_proc => [nil, nil, mock_proc], :format => "4444", :padding_length => 7)
+          step_9 = mock_step(:regexp_args_proc => [nil, nil, mock_proc], :format => "999999999", :padding_length => 2)
+
+          step_mother = mock('step_mother')
+          formatter = PrettyFormatter.new io, step_mother, :source => true
+          
+          formatter.step_passed(step_1, nil, nil)
+          formatter.step_passed(step_4, nil, nil)
+          formatter.step_passed(step_9, nil, nil)
+          
+          io.string.should include("Given 1          # steps/example_steps.rb:11")
+          io.string.should include("Given 4444       # steps/example_steps.rb:11")
+          io.string.should include("Given 999999999  # steps/example_steps.rb:11")
+        end
+        
+        it "should NOT display step source for pending step" do
+          io = StringIO.new
+          step_mother = mock('step_mother')
+
+          formatter = PrettyFormatter.new io, step_mother, :source => true
+          formatter.step_pending(mock_step(:regexp_args_proc => [nil, nil, mock_proc]), nil, nil)
+          
+          io.string.should_not include("steps/example_steps.rb:11")
+        end
+        
+      end
     end
   end
 end

data/spec/cucumber/tree/scenario_spec.rb

@@ -6,8 +6,8 @@ module Cucumber
       xit "should reuse steps in GivenScenario" do
         given_scenario = GivenScenario.new(scenario_2, "First", 99)
       
-        scenario_2.add_step(given_scenario)
-        scenario_2.add_step(step_a)
+        scenario_2.create_step(given_scenario)
+        scenario_2.create_step(step_a)
         scenario_2.steps.should == [step_1, step_2, step_a]
       end
     end

data/spec/cucumber/tree/step_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Cucumber
+  module Tree
+    describe Step do
+      it "should have padding_length 2 when alone" do
+        scenario = Scenario.new(nil, nil)
+        step = scenario.create_step('Given', '666666', 98)
+        step.padding_length.should == 2
+      end
+
+      it "should have padding_length 5 when 3 shorter" do
+        scenario = Scenario.new(nil, nil)
+        long = scenario.create_step('Given', '999999999', 80)
+        step = scenario.create_step('Given', '666666', 98)
+        step.padding_length.should == 5
+      end
+    end
+  end
+end
+

data/spec/cucumber/treetop_parser/feature_parser_spec.rb

@@ -68,6 +68,11 @@ module Cucumber
         f.should have(0).scenarios
       end
       
+      it "should parse features with dos line endings" do
+        p = FeatureParser.new
+        f = p.parse_feature(File.dirname(__FILE__) + '/test_dos.feature')
+        f.should have(5).scenarios
+      end
     end
   end
 end

data/spec/cucumber/treetop_parser/test_dos.feature

@@ -0,0 +1,24 @@
+Feature: Search
+  In order to learn cucumber
+  As an engineer
+  I want to run some simple tests
+
+  Scenario: 1) Reverse a String
+    Given a string "abc"
+    When the string is reversed
+    Then the string should be "cba"
+    
+    |input |output|
+    |a     |a     |
+    |ab    |ba    |    
+
+  Scenario: 2) Upcase a String
+    Given a string "abc"
+    When the string is upcased
+    Then the string should be "ABC"
+
+  Scenario: 3) Combining 2 Methods
+    Given a string "abc"
+    When the string is upcased
+    And the string is reversed
+    Then the string should be "CBA"

data/spec/spec_helper.rb

@@ -5,13 +5,7 @@ require 'spec'
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber'
 require 'cucumber/treetop_parser/feature_en'
-
-# Prevent CLI's exit hook from running
-class Cucumber::CLI
-  def self.execute_called?
-    true
-  end
-end
+Cucumber.load_language('en')
 
 # Open up the tree classes a little for easier inspection.
 module Cucumber

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-01 00:00:00 +02:00
+date: 2008-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,8 @@ files:
 - examples/danish_calculator/features/steps/kalkulator_steps.rb
 - examples/danish_calculator/features/summering.feature
 - examples/danish_calculator/lib/kalkulator.rb
+- examples/dos_line_endings/Rakefile
+- examples/dos_line_endings/features/dos_line_endings.feature
 - examples/estonian_calculator/Rakefile
 - examples/estonian_calculator/features/kalkulaator_steps.rb
 - examples/estonian_calculator/features/liitmine.feature
@@ -218,6 +220,7 @@ files:
 - spec/cucumber/sell_cucumbers.feature
 - spec/cucumber/step_mother_spec.rb
 - spec/cucumber/tree/scenario_spec.rb
+- spec/cucumber/tree/step_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature
 - spec/cucumber/treetop_parser/feature_parser_spec.rb
@@ -225,6 +228,7 @@ files:
 - spec/cucumber/treetop_parser/given_scenario.feature
 - spec/cucumber/treetop_parser/multiple_tables.feature
 - spec/cucumber/treetop_parser/spaces.feature
+- spec/cucumber/treetop_parser/test_dos.feature
 - spec/cucumber/treetop_parser/with_comments.feature
 - spec/spec.opts
 - spec/spec_helper.rb