aslakhellesoy-cucumber 0.1.16.4 → 0.1.16.5

data/spec/cucumber/cli_spec.rb

@@ -32,7 +32,7 @@ module Cucumber
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
       cli.parse_options!(%w{--format progress --profile bongo})
-      cli.options[:formats].should == {'progress' => [STDOUT]}
+      cli.options[:formats].should == {'progress' => STDOUT}
       cli.options[:require].should == ['from/yml']
     end
 
@@ -58,7 +58,7 @@ Could not find profile: 'i_do_not_exist'
 Defined profiles in cucumber.yml:
   * default
   * html_report
-      END_OF_MESSAGE
+END_OF_MESSAGE
         
       error.string.should == expected_message
     end
@@ -121,12 +121,10 @@ Defined profiles in cucumber.yml:
     end
     
     it "should accept --dry-run option" do
-      cli = CLI.new
+      cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--dry-run})
       cli.options[:dry_run].should be_true
-      mock_executor = mock_executor()
-      mock_executor.should_receive(:dry_run=).with(true)
-      cli.execute!(stub('step mother'), mock_executor, mock_features)
+      cli.execute!(stub('step mother'))
     end
 
     it "should accept --no-source option" do
@@ -143,12 +141,12 @@ Defined profiles in cucumber.yml:
       cli.options[:snippets].should be_false
     end
 
-    it "should accept --quiet option" do
+    it "should set snippets and source to false with --quiet option" do
       cli = CLI.new
       cli.parse_options!(%w{--quiet})
       
-      cli.options[:snippets].should be_false
-      cli.options[:source].should be_false
+      cli.options[:snippets].should be_nil
+      cli.options[:source].should be_nil
     end
 
     it "should accept --verbose option" do
@@ -165,12 +163,11 @@ Defined profiles in cucumber.yml:
       cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--require /features})
 
-      cli.should_receive(:require).twice.with(/treetop_parser/).ordered
       cli.should_receive(:require).with("/features/support/env.rb").ordered
       cli.should_receive(:require).with("/features/step_definitions/foo.rb").ordered
       cli.should_receive(:require).with("spec/expectations/differs/default").ordered
 
-      cli.execute!(stub('step mother'), mock_executor, mock_features)
+      cli.execute!(stub('step mother'))
     end
 
     describe "verbose mode" do
@@ -179,21 +176,22 @@ Defined profiles in cucumber.yml:
         @out = StringIO.new
         @cli = CLI.new(@out)
         @cli.stub!(:require)
+        @empty_feature = Ast::Feature.new(Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         Dir.stub!(:[])
       end
 
       it "should show ruby files required" do
         @cli.parse_options!(%w{--verbose --require example.rb})
-        @cli.execute!(stub('step mother'), mock_executor, mock_features)
+        @cli.execute!(stub('step mother'))
         
         @out.string.should include('example.rb')
       end
       
       it "should show feature files parsed" do
-        TreetopParser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_feature => nil))
+        Parser::FeatureParser.stub!(:new).and_return(mock("feature parser", :parse_file => @empty_feature))
           
         @cli.parse_options!(%w{--verbose example.feature})
-        @cli.execute!(stub('step mother'), mock_executor, mock_features)
+        @cli.execute!(stub('step mother'))
 
         @out.string.should include('example.feature')
       end
@@ -201,99 +199,47 @@ Defined profiles in cucumber.yml:
     end
 
     it "should accept --out option" do
-      cli = CLI.new
-      File.should_receive(:open).with('jalla.txt', 'w')
+      cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--out jalla.txt})
+      cli.options[:formats]['pretty'].should == 'jalla.txt'
     end
 
     it "should accept multiple --out options" do
-      cli = CLI.new
-      mock_file1 = stub(File, :open => nil)
-      mock_file2 = stub(File, :open => nil)
-      File.stub!(:open).and_return(mock_file1, mock_file2)
-
+      cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--format progress --out file1 --out file2})
-      cli.options[:formats].should == {'progress' => [mock_file1, mock_file2]}
+      cli.options[:formats].should == {'progress' => 'file2'}
     end
 
     it "should accept multiple --format options" do
-      cli = CLI.new
+      cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--format pretty --format progress})
       cli.options[:formats].should have_key('pretty')
       cli.options[:formats].should have_key('progress')
     end
 
     it "should associate --out to previous --format" do
-      cli = CLI.new
-      mock_file1 = stub(File, :open => nil)
-      mock_file2 = stub(File, :open => nil)
-      File.stub!(:open).and_return(mock_file1, mock_file2)
-
+      cli = CLI.new(StringIO.new)
       cli.parse_options!(%w{--format progress --out file1 --format profile --out file2})
-      cli.options[:formats].should == {'progress' => [mock_file1], 'profile' => [mock_file2]}
-    end
-
-    it "should allow a single formatter to have STDOUT and a file" do
-      cli = CLI.new
-      mock_file = stub(File, :open => nil)
-      File.stub!(:open).and_return(mock_file)
-
-      cli.parse_options!(%w{--format progress --format progress --out file})
-      cli.options[:formats].should == {'progress' => [STDOUT, mock_file]}
+      cli.options[:formats].should == {"profile"=>"file2", "progress"=>"file1"}
     end
 
-    it "should register --out files with an output broadcaster" do
-      cli = CLI.new
-      mock_file = stub(File)
-      File.stub!(:open).and_return(mock_file)
-      mock_output_broadcaster = mock_broadcaster
-      Broadcaster.stub!(:new).and_return(mock_broadcaster, mock_output_broadcaster)
-      
-      mock_output_broadcaster.should_receive(:register).with(mock_file)
-      cli.parse_options!(%w{--out test.file})
-
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
-    end
-
-    it "should register --formatters with the formatter broadcaster" do
-      cli = CLI.new
-      mock_progress_formatter = stub(Formatters::ProgressFormatter)
-      Formatters::ProgressFormatter.stub!(:new).and_return(mock_progress_formatter)
-      mock_formatter_broadcaster = mock_broadcaster
-      Broadcaster.stub!(:new).and_return(mock_formatter_broadcaster, mock_broadcaster)
-   
-      mock_formatter_broadcaster.should_receive(:register).with(mock_progress_formatter)
-      cli.parse_options!(%w{--format progress})
-      
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
-    end
-
-    it "should setup the executor with the formatter broadcaster" do
-      cli = CLI.new
-      broadcaster = Broadcaster.new
-      Broadcaster.stub!(:new).and_return(broadcaster)
-      mock_executor = mock_executor()
-      mock_executor.should_receive(:formatters=).with(broadcaster)
-      cli.parse_options!(%w{--format progress})
-
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
-    end
-    
     describe "--format with class" do
      
      describe "in module" do
 
         it "should resolve each module until it gets Formatter class" do
-          cli = CLI.new
+          cli = CLI.new(nil)
           mock_module = mock('module')
           cli.parse_options!(%w{--format ZooModule::MonkeyFormatterClass})
           Object.stub!(:const_defined?).and_return(true)
           mock_module.stub!(:const_defined?).and_return(true)
 
+          f = stub('formatter', :null_object => true)
+
           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 => nil))
+          mock_module.should_receive(:const_get).with('MonkeyFormatterClass').and_return(mock('formatter class', :new => f))
 
-          cli.execute!(stub('step mother'), mock_executor, stub('features'))
+          cli.execute!(stub('step mother'))
         end
 
       end
@@ -306,7 +252,7 @@ Defined profiles in cucumber.yml:
           Object.stub!(:const_defined?).with('magical').and_return(true)
         end
         
-        it "should create the formatter" do
+        xit "should create the formatter" do
           cli = CLI.new
           mock_formatter = mock('magical formatter')
           cli.parse_options!(%w{--format magical})
@@ -316,7 +262,7 @@ Defined profiles in cucumber.yml:
           cli.execute!(stub('step mother'), mock_executor, stub('features'))
         end
                 
-        it "should register the formatter with broadcaster" do
+        xit "should register the formatter with broadcaster" do
           cli = CLI.new
           broadcaster = Broadcaster.new
           mock_formatter = mock('magical formatter')
@@ -346,15 +292,15 @@ Defined profiles in cucumber.yml:
           @cli.parse_options!(%w{--format exists_but_evil}) 
         end
         
-        it "should show exception" do
+        xit "should show exception" do
           Kernel.stub!(:exit)
 
-          @cli.execute!(stub('step mother'), mock_executor, stub('features'))
+          @cli.execute!(stub('step mother'))
 
           @error.string.should include("No such method")
         end
         
-        it "should exit" do
+        xit "should exit" do
           Kernel.should_receive(:exit)
 
           @cli.execute!(stub('step mother'), mock_executor, stub('features'))
@@ -372,7 +318,7 @@ Defined profiles in cucumber.yml:
           @cli.parse_options!(%w{--format invalid})
         end
 
-        it "should display a format error" do
+        xit "should display a format error" do
           Kernel.stub!(:exit)
 
           @cli.execute!(stub('step mother'), mock_executor, stub('features'))
@@ -380,15 +326,15 @@ Defined profiles in cucumber.yml:
           @error.string.should include("Invalid format: invalid\n")
         end
         
-        it "should display --help" do
+        xit "should display --help" do
           Kernel.stub!(:exit)
 
-          @cli.execute!(stub('step mother'), mock_executor, stub('features'))
+          @cli.execute!(stub('step mother'))
           
           @out.string.should include("Usage: cucumber")
         end
 
-        it "should exit" do
+        xit "should exit" do
           Kernel.should_receive(:exit)
 
           @cli.execute!(stub('step mother'), mock_executor, stub('features'))
@@ -405,7 +351,7 @@ Defined profiles in cucumber.yml:
       cli.options[:scenario_names].should include("User signs up")
     end
 
-    it "should register --scenario options with the executor" do
+    xit "should register --scenario options with the executor" do
       cli = CLI.new
       cli.parse_options!(['--scenario', "User logs in", '--scenario', "User signs up"])
       executor = mock_executor
@@ -414,35 +360,15 @@ Defined profiles in cucumber.yml:
     end
 
     it "should accept --color option" do
-      cli = CLI.new
-      cli.parse_options!(['--color'])
-      cli.options[:color].should == true
+      cli = CLI.new(StringIO.new)
       Term::ANSIColor.should_receive(:coloring=).with(true)
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
+      cli.parse_options!(['--color'])
     end
 
     it "should accept --no-color option" do
-      cli = CLI.new
-      cli.parse_options!(['--no-color'])
-      cli.options[:color].should == false
-      Term::ANSIColor.should_receive(:coloring=).with(false)
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
-    end
-
-    it "should accept --color and --no-color and use the last one" do
-      cli = CLI.new
-      cli.parse_options!(['--color', '--no-color'])
-      cli.options[:color].should == false
+      cli = CLI.new(StringIO.new)
       Term::ANSIColor.should_receive(:coloring=).with(false)
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
-    end
-
-    it "should use a default color setting if no option is given" do
-      cli = CLI.new
-      cli.parse_options!(['--'])
-      cli.options[:color].should == nil
-      Term::ANSIColor.should_not_receive(:coloring=)
-      cli.execute!(stub('step mother'), mock_executor, stub('features'))
+      cli.parse_options!(['--no-color'])
     end
 
     describe "--backtrace" do
@@ -456,17 +382,17 @@ Defined profiles in cucumber.yml:
         begin
           "x".should == "y"
         rescue => e
-          e.cucumber_backtrace[0].should_not == "#{__FILE__}:#{__LINE__ - 2}"
+          e.backtrace[0].should_not == "#{__FILE__}:#{__LINE__ - 2}"
         end
       end
 
-      it "should strip gems when --backtrace is absent" do
+      xit "should strip gems when --backtrace is absent" do
         cli = CLI.new
         cli.parse_options!(['--'])
         begin
           "x".should == "y"
         rescue => e
-          e.cucumber_backtrace[0].should == "#{__FILE__}:#{__LINE__ - 2}"
+          e.backtrace[0].should == "#{__FILE__}:#{__LINE__ - 2}"
         end
       end
 
@@ -475,46 +401,15 @@ Defined profiles in cucumber.yml:
       end
     end
 
-    describe "example.feature:line file arguments" do
-
-      it "should extract line numbers" do
-        cli = CLI.new
-        cli.parse_options!(%w{example.feature:10})
-      
-        cli.options[:lines_for_features]['example.feature'].should == [10]
-      end
-    
-      it "should remove line numbers" do
-        cli = CLI.new
-        cli.parse_options!(%w{example.feature:10})
-      
-        cli.paths.should == ["example.feature"]
-      end
-
-      it "should support multiple feature:line numbers" do
-        cli = CLI.new
-        cli.parse_options!(%w{example.feature:11 another_example.feature:12})
-      
-        cli.options[:lines_for_features].should == {'another_example.feature' => [12], 'example.feature' => [11]}
-      end
-
-      it "should accept multiple line numbers for a single feature" do
-        cli = CLI.new
-        cli.parse_options!(%w{example.feature:11:12})
-      
-        cli.options[:lines_for_features].should == {'example.feature' => [11, 12]}
-      end
-    end
-
     it "should search for all features in the specified directory" do
-      cli = CLI.new
+      cli = CLI.new(StringIO.new)
 
       cli.parse_options!(%w{feature_directory/})
       File.stub!(:directory?).and_return(true)
 
       Dir.should_receive(:[]).with("feature_directory/**/*.feature").any_number_of_times.and_return([])
       
-      cli.execute!(stub('step mother'), mock_executor, mock_features)
+      cli.execute!(stub('step mother'))
     end
 
   end

data/spec/cucumber/core_ext/proc_spec.rb

@@ -1,45 +1,37 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require 'cucumber/core_ext/instance_exec'
 
-module Cucumber
-  module CoreExt
-    describe "proc extended with CallIn" do
-      it "should raise ArityMismatchError for too many args (expecting 0)" do
-        proc = lambda {}
-        proc.extend CallIn
-        lambda {
-          proc.call_in(Object.new, 1)
-        }.should raise_error(Cucumber::ArityMismatchError, "expected 0 block argument(s), got 1")
+describe Proc do
+  it "should raise ArityMismatchError for too many args (expecting 0)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, 'foo', 1) do
       end
+    }.should raise_error(Cucumber::ArityMismatchError, "expected 0 block argument(s), got 1")
+  end
 
-      it "should raise ArityMismatchError for too many args (expecting 1)" do
-        proc = lambda {|a|}
-        proc.extend CallIn
-        lambda {
-          proc.call_in(Object.new, 1, 2)
-        }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 2")
+  it "should raise ArityMismatchError for too many args (expecting 1)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, 'foo', 1,2) do |a|
       end
+    }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 2")
+  end
 
-      it "should raise ArityMismatchError for too few args (expecting 1)" do
-        proc = lambda {|a|}
-        proc.extend CallIn
-        lambda {
-          proc.call_in(Object.new)
-        }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 0")
+  it "should raise ArityMismatchError for too few args (expecting 1)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, 'foo') do |a|
       end
+    }.should raise_error(Cucumber::ArityMismatchError, "expected 1 block argument(s), got 0")
+  end
 
-      it "should raise ArityMismatchError for too few args (expecting 2)" do
-        proc = lambda {|a,b|}
-        proc.extend CallIn
-        lambda {
-          proc.call_in(Object.new, 1)
-        }.should raise_error(Cucumber::ArityMismatchError, "expected 2 block argument(s), got 1")
+  it "should raise ArityMismatchError for too few args (expecting 2)" do
+    lambda {
+      Object.new.cucumber_instance_exec(true, 'foo', 1) do |a,b|
       end
-      
-      it "should remove extraneous path info for file" do
-        proc = lambda {|a,b|}
-        proc.extend CallIn
-        proc.file_colon_line.should == "spec/cucumber/core_ext/proc_spec.rb:39"
-      end
-    end
+    }.should raise_error(Cucumber::ArityMismatchError, "expected 2 block argument(s), got 1")
+  end
+  
+  it "should remove extraneous path info for file" do
+    proc = lambda {|a,b|}
+    proc.file_colon_line.should == "spec/cucumber/core_ext/proc_spec.rb:34"
   end
-end
+end

data/spec/cucumber/core_ext/string_spec.rb

@@ -17,6 +17,14 @@ describe String, "#gzub" do
     end
     f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
   end
+
+  it "should format groups with proc object" do
+    proc = lambda do |m|
+      "<span>#{m}</span>"
+    end
+    f = "I ate 1 egg this morning".gzub(/I (\w+) (\d+) (\w+) this (\w+)/, proc)
+    f.should == "I <span>ate</span> <span>1</span> <span>egg</span> this <span>morning</span>"
+  end
   
   it "should format groups with block with not all placeholders having a value" do
     f = "another member named Bob joins the group".gzub(/(a|another) (user|member) named ([^ ]+)( who is not logged in)?/) do |m|

data/spec/cucumber/{formatters → formatter}/ansicolor_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'cucumber/formatters/ansicolor'
+require 'cucumber/formatter/ansicolor'
 
 module Cucumber
-  module Formatters
+  module Formatter
     describe ANSIColor do
       include ANSIColor
       

data/spec/cucumber/formatter/html/cucumber.css

@@ -0,0 +1,37 @@
+body {
+  background: #000000;
+  color: #FFFFFF;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 10px;
+}
+ 
+td
+{
+  border-color: #FFFFFF;
+  border-width: 0 0.15em 0 0.15em;
+  border-style: solid;
+  padding: 0 0.5em 0 0.5em;
+}
+
+.multiline_table {
+  padding-left: 4em;
+}
+ 
+.missing {
+  color: yellow;
+}
+
+.pending {
+  color: yellow;
+}
+
+.passed {
+  color: green;
+}
+
+.failed {
+  color: red;
+}

data/spec/cucumber/formatter/html/cucumber.js

@@ -0,0 +1,11 @@
+jQuery.fn.status = function(s) {
+  this.removeClass('idle').addClass(s);
+  this.next('span.multiline').addClass(s);
+  this.parent().addClass(s);
+  this.parent().parent().children('span.feature').addClass(s);
+}
+
+jQuery.fn.failed = function(message, backtrace) {
+  this.status('failed');
+  this.append("\n<span>" + message.replace(/^/gm, '      ') + "</span>").append("\n<span>" + backtrace.replace(/^/gm, '      ') + "</span>");
+}

data/spec/cucumber/formatter/html/index.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Cucumber results</title>
+  <link rel="stylesheet" href="cucumber.css" type="text/css" charset="utf-8" />
+	<script type="text/javascript" src="jquery-1.3.min.js"></script>
+	<script type="text/javascript" src="jquery.uitableedit.js"></script>
+	<script type="text/javascript" src="cucumber.js"></script>
+</head>
+
+<body>
+<pre>
+<span><span class="feature">Feature: Sample</span>
+
+<span class="scenario">  Scenario: Missing
+<span id="step_1">    Given missing</span></span>
+
+<span class="scenario">  Scenario: Passing
+<span id="step_2">    Given passing</span><div class="multiline_table"><table>
+  <tr>
+    <td class="passed">1</td>
+    <td class="passed">22</td>
+  </tr>
+  <tr>
+    <td class="failed">4444</td>
+    <td class="failed">333</td>
+  </tr>
+</table></div></span>
+<span class="scenario">  Scenario: Failing
+<span id="step_3">    Given failing</span>
+<span class="multiline">      """
+      Aslak
+      Hellesøy
+      """</span></span></span>
+</pre>
+
+<script type="text/javascript">$('#step_1').failed('error message', "line1\nline2\nline3")</script>
+<script type="text/javascript">$('#step_2').status('pending')</script>
+<script type="text/javascript">$('#step_3').status('passed')</script>
+
+</body>
+</html>