kosmas58-cucumber 0.3.9.4 → 0.3.11.3

data/lib/cucumber/formatter/cucumber.sass

@@ -1,39 +1,49 @@
 # cucumber.css is generated from cucumber.sass
-# Regenerate with the following command:
-#
-#   sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css
-#
-.cucumber
-  :background black
-  :color white
-  :padding 1em
+# Regenerate with rake sass
 
-  .passed
-    :color green
-  .undefined
-    :color yellow
-  .pending
-    :color yellow
-  .failed
-    :color red
-  .skipped
-    :color cyan
-  .outline
-    :color cyan
-  .param
-    :font-weight bold
+!step_left   = 5px solid
+!step_bottom = 1px solid
 
-  a
-    :text-decoration none
-    :color inherit
+!failed         = #FFC0CB
+!failed_dark    = #FF0000
+!failed_text    = #8B0000
 
-    &:hover
-      :text-decoration underline
-    &:visited
-      :font-weight normal
+!passed         = #98FB98
+!passed_dark    = #00FF00
+!passed_text    = #001111
 
-  ol
-    :list-style none
+!skipped        = #E0FFFF
+!skipped_dark   = #00FFFF
+!skipped_text   = #001111
+
+!pending        = #FFFF00
+!pending_dark   = #FF8000
+!pending_text   = #2A1B0A
+
+!undefined      = #FFFF00
+!undefined_dark = #FF8000
+!undefined_text = #2A1B0A
+
+.cucumber
+  :font-family "Lucida Grande", Helvetica, sans-serif
+  :font-size 0.7em
+  :background white
+  :padding 1em
+  
+  h1, h2, h3, h4, ol, li, pre, p
+    :font-size 1em
+    :padding 0px
+    :margin 0px
+
+  div.feature
+    :border 1px solid 
+    :padding 2px
+    :margin 4px
+
+    div.background, div.scenario, p
+      :padding 0em 0em 0em 1em
+      div.examples
+        :padding 0em 0em 0em 1em
 
   .stats
     :margin 2em
@@ -47,3 +57,83 @@
     :margin-top 0
     :margin-bottom 0
     :margin-left 1em
+
+  a
+    :text-decoration none
+    :color inherit
+
+    &:hover
+      :text-decoration underline
+    &:visited
+      :font-weight normal
+
+    div.examples
+      :border 1px solid 
+      :padding 2px
+      :margin 4px
+
+  table
+    :border-collapse collapse
+    
+    td, th
+      :font-size 0.7em
+      :border 1px solid #AAAAAA
+    td.failed
+      :background #FFC0CB
+      :color #8B0000
+    td.passed
+      :background #98FB98
+      :color= !passed_text
+    td.skipped
+      :background= !skipped
+      :color= !skipped_text
+    td.pending
+      :background #FFFFE0
+      :color #111100
+    td.undefined
+      :background #FFFFE0
+      :color #111100
+
+  ol
+    :list-style none
+  
+    li
+      :margin 0em 0em 0em 1em
+      :padding 0em 0em 0em 0.2em
+      span.param
+        :font-weight bold
+    li.failed
+      :border-left= !step_left !failed_dark
+      :border-bottom= !step_bottom !failed_dark
+      :background= !failed
+      :color= !failed_text
+      span.param
+        :background !failed_dark
+    li.passed
+      :border-left= !step_left !passed_dark
+      :border-bottom= !step_bottom !passed_dark
+      :background= !passed
+      :color= !passed_text
+      span.param
+        :background= !passed_dark
+    li.skipped
+      :border-left= !step_left !skipped_dark
+      :border-bottom= !step_bottom !skipped_dark
+      :background= !skipped
+      :color= !skipped_text
+      span.param
+        :background= !skipped_dark
+    li.pending
+      :border-left= !step_left !pending_dark
+      :border-bottom= !step_bottom !pending_dark
+      :background= !pending
+      :color= !pending_text
+      span.param
+        :background= !pending_dark
+    li.undefined
+      :border-left= !step_left !undefined_dark
+      :border-bottom= !step_bottom !undefined_dark
+      :background= !undefined
+      :color= !undefined_text
+      span.param
+        :background= !undefined_dark

data/lib/cucumber/formatter/html.rb

@@ -16,7 +16,11 @@ module Cucumber
       def initialize(step_mother, io, options)
         super(step_mother)
         @options = options
-        @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
+        @builder = create_builder(io)
+      end
+      
+      def create_builder(io)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)
@@ -89,6 +93,7 @@ module Cucumber
         @listing_background = true
         @builder.h3 do |h3|
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(name, :class => 'val')
         end
       end
@@ -108,6 +113,7 @@ module Cucumber
         @listing_background = false
         @builder.h3 do
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(name, :class => 'val')
         end
       end
@@ -127,7 +133,11 @@ module Cucumber
       end
 
       def visit_examples_name(keyword, name)
-        @builder.h4("#{keyword} #{name}")
+        @builder.h4 do
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(name, :class => 'val')
+        end
       end
 
       def visit_steps(steps)
@@ -181,7 +191,7 @@ module Cucumber
 
       def visit_py_string(string)
         @builder.pre(:class => 'val') do |pre|
-          pre << string
+          @builder.text!('  ' + string)
         end
       end
 
@@ -221,6 +231,7 @@ module Cucumber
         step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div do |div|
           @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
           @builder.span(:class => 'step val') do |name|
             name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
           end

data/lib/cucumber/formatter/junit.rb

@@ -11,10 +11,9 @@ module Cucumber
 
       def initialize(step_mother, io, options)
         super(step_mother)
+        raise "You *must* specify --out DIR for the junit formatter" unless String === io && File.directory?(io)
         @reportdir = io
         @options = options
-        raise "You *must* specify --out DIR for the junit formatter" unless @reportdir
-        raise "Use --out DIR (not --out FILE) for the junit formatter" if File === @reportdir
       end
 
       def visit_feature(feature)

data/lib/cucumber/rake/task.rb

@@ -90,7 +90,7 @@ module Cucumber
         class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{attribute}=(value)
             @#{attribute} = value
-            warn("Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles")
+            warn("\nWARNING: Cucumber::Rake::Task##{attribute} is deprecated and will be removed in 0.4.0.  Please use profiles for complex settings: http://wiki.github.com/aslakhellesoy/cucumber/using-rake#profiles\n")
           end
         EOF
       end

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 9
-    PATCH = 4 # Set to nil for official release
+    TINY  = 11
+    PATCH = 3 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/cucumber_generator.rb

@@ -21,12 +21,18 @@ class CucumberGenerator < Rails::Generator::Base
       m.gsub_file 'config/database.yml', /test:.*\n/, "test: &TEST\n"
       m.gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *TEST"
 
-      m.directory "features/support"
-      m.template  "env.rb",                             "features/support/env.rb"
+      m.directory 'features/support'
+
+      if options[:spork]
+        m.template  'spork_env.rb',     'features/support/env.rb'
+      else
+        m.template  'env.rb',           'features/support/env.rb'
+      end
+    
       m.file      File.join(lang, "paths.rb"), "features/support/paths.rb"
 
-      m.directory "lib/tasks"
-      m.template  "cucumber.rake", "lib/tasks/cucumber.rake"
+      m.directory 'lib/tasks'
+      m.template  'cucumber.rake',    'lib/tasks/cucumber.rake'
 
       m.file      "cucumber", "script/cucumber", {
         :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
@@ -72,9 +78,13 @@ protected
       options[:framework] = :testunit
     end
     
-     opt.on('--language [lang]', 'Setup cucumber for use with language [lang] ("en" is default') do |value|
+    opt.on('--language [lang]', 'Setup cucumber for use with language [lang] ("en" is default') do |value|
        options[:language] = value || :en
     end
+
+    opt.on('--spork', 'Setup cucumber for use with Spork') do |value|
+      options[:spork] = true
+    end
   end
 
 end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -3,13 +3,13 @@ $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.director
 begin
   require 'cucumber/rake/task'
 
-  Cucumber::Rake::Task.new(:features) do |t| 
-    t.fork = true
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.fork = true 
   <% if language == :en %>
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    t.cucumber_opts = [<%= options[:spork] ? "'--drb', " : "" %>'--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]    
   <% else %>
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty'), '--language', <%= language%>]
-  <% end %>
+    t.cucumber_opts = [<%= options[:spork] ? "'--drb', " : "" %>'--format', (ENV['CUCUMBER_FORMAT'] || 'pretty'), '--language', <%= language%>]
+  <% end %>  
   end
   task :features => 'db:test:prepare'
 rescue LoadError

data/rails_generators/cucumber/templates/de/paths.rb

@@ -8,15 +8,15 @@ module NavigationHelpers
   def path_to(page_name)
     case page_name
     
-     when /Startseite/
-     '/'
+    when /Startseite/
+      '/'
     
     # Add more mappings here.
     # Here is a more fancy example:
     #
     #   when /^(.*)'s profile page$/i
     #     user_profile_path(User.find_by_login($1))
-    
+
     else
       raise "Kann für \"#{page_name}\" kein Mapping zu einem Pfad finden.\n" +
         "Sie sollten jetzt ein Mapping in #{__FILE__} hinzufügen."

data/rails_generators/cucumber/templates/de/webrat_steps.rb

@@ -40,8 +40,8 @@ end
 #   <%%= f.label :alternative %><br />
 #   <%%= f.datetime_select :alternative %>
 # The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" data and time
-# And I select "November 25, 2004 10:30" as the "Alternative" data and time
+# When I select "November 23, 2004 11:20" as the "Preferred" date and time
+# And I select "November 25, 2004 10:30" as the "Alternative" date and time
 When /^ich "([^\"]*)" als "([^\"]*)" Datum und Uhrzeit wähle$/ do |datetime, datetime_label|
   select_datetime(datetime, :from => datetime_label)
 end
@@ -121,7 +121,7 @@ Then /^sollte das Feld "([^\"]*)" nicht "([^\"]*)" enthalten$/ do |field, value|
   assert_no_match(/#{value}/, field_labeled(field).value)
 <% end -%>
 end
-
+    
 Then /^sollte das "([^\"]*)" Kästchen ausgewählt sein$/ do |label|
 <% if framework == :rspec -%>
   field_labeled(label).should be_checked
@@ -130,6 +130,14 @@ Then /^sollte das "([^\"]*)" Kästchen ausgewählt sein$/ do |label|
 <% end -%>
 end
 
+Then /^sollte das Kästchen "([^\"]*)" nicht ausgewählt sein$/ do |label|
+<% if framework == :rspec -%>
+  field_labeled(label).should_not be_checked
+<% else -%>
+  assert !field_labeled(label).checked?
+<% end -%>
+end
+
 Then /^sollte ich auf (.+) sein$/ do |page_name|
 <% if framework == :rspec -%>
   URI.parse(current_url).path.should == path_to(page_name)

data/rails_generators/cucumber/templates/env.rb

@@ -2,10 +2,17 @@
 ENV["RAILS_ENV"] ||= "cucumber"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
-require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
+
+# Comment out the next line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode'
+
+# Comment out the next line if you don't want transactions to
+# open/roll back around each scenario
 Cucumber::Rails.use_transactional_fixtures
-Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
-                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+
+# Comment out the next line if you want Rails' own error handling
+# (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+Cucumber::Rails.bypass_rescue
 
 require 'webrat'
 

data/rails_generators/cucumber/templates/spork_env.rb

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'spork'
+ 
+Spork.prefork do
+  # Sets up the Rails environment for Cucumber
+  ENV["RAILS_ENV"] = "cucumber"
+  require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+ 
+  require 'webrat'
+ 
+  Webrat.configure do |config|
+    config.mode = :rails
+  end
+ 
+  require 'webrat/core/matchers'
+  require 'cucumber'
+
+  # Comment out the next line if you don't want Cucumber Unicode support
+  require 'cucumber/formatter/unicode'
+
+  require 'spec/rails'
+  require 'cucumber/rails/rspec'
+end
+ 
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  require 'cucumber/rails/world'
+
+  # Comment out the next line if you don't want transactions to
+  # open/roll back around each scenario
+  Cucumber::Rails.use_transactional_fixtures
+
+  # Comment out the next line if you want Rails' own error handling
+  # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+  Cucumber::Rails.bypass_rescue
+end

data/spec/cucumber/cli/configuration_spec.rb

@@ -83,6 +83,61 @@ module Cli
       end
     end
 
+    describe '#drb?' do
+      it "indicates whether the --drb flag was passed in or not" do
+        config = Configuration.new(StringIO.new)
+
+        config.parse!(%w{features})
+        config.drb?.should == false
+
+
+        config.parse!(%w{features --drb})
+        config.drb?.should == true
+      end
+    end
+
+    context '--drb' do
+      it "removes the --drb flag from the args" do
+        config = Configuration.new(StringIO.new)
+
+        args = %w{features --drb}
+        config.parse!(args)
+        args.should == %w{features}
+      end
+
+      it "keeps all other flags intact" do
+        config = Configuration.new(StringIO.new)
+
+        args = %w{features --drb --format profile}
+        config.parse!(args)
+        args.should == %w{features --format profile}
+      end
+
+    end
+
+    context '--drb in a profile' do
+      it "removes the --drb flag from the args" do
+        given_cucumber_yml_defined_as({'server' => '--drb features'})
+        config = Configuration.new(StringIO.new)
+
+        args = %w{--profile server}
+        config.parse!(args)
+        args.should == %w{features}
+      end
+
+      it "keeps all other flags intact from all profiles involved" do
+        given_cucumber_yml_defined_as({'server' => '--drb features --profile nested',
+                                       'nested' => '--verbose'})
+
+        config = Configuration.new(StringIO.new)
+
+        args = %w{--profile server --format profile}
+        config.parse!(args)
+        args.should == %w{features --verbose --format profile}
+      end
+
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 
@@ -156,7 +211,7 @@ END_OF_MESSAGE
       expected_error_message = /cucumber.yml was found, but could not be parsed. Please refer to cucumber's documentation on correct profile usage./
 
       given_cucumber_yml_defined_as("input that causes an exception in YAML loading")
-      YAML.should_receive(:load).and_raise Exception
+      YAML.should_receive(:load).and_raise ArgumentError
 
       config = Configuration.new(StringIO.new, error = StringIO.new)
       lambda{config.parse!([])}.should raise_error(expected_error_message)

data/spec/cucumber/cli/drb_client_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+
+module Cucumber
+  module Cli
+    describe DRbClient do
+      before(:each) do
+        @args = ['features']
+        @error_stream = StringIO.new
+        @out_stream = StringIO.new
+
+        @drb_object = mock('DRbObject', :run => true)
+        DRbObject.stub!(:new_with_uri).and_return(@drb_object)
+      end
+
+      it "starts up a druby service" do
+        DRb.should_receive(:start_service).with("druby://localhost:0")
+        DRbClient.run(@args, @error_stream, @out_stream)
+      end
+
+      it "connects to the DRb server" do
+        DRbObject.should_receive(:new_with_uri).with("druby://127.0.0.1:8990")
+        DRbClient.run(@args, @error_stream, @out_stream)
+      end
+
+      it "runs the fearures on the DRb server" do
+        @drb_object.should_receive(:run).with(@args, @error_stream, @out_stream)
+        DRbClient.run(@args, @error_stream, @out_stream)
+      end
+
+      it "returns raises an error when it can't connect to the server" do
+        DRbObject.stub!(:new_with_uri).and_raise(DRb::DRbConnError)
+        running { DRbClient.run(@args, @error_stream, @out_stream) }.should raise_error(DRbClientError, "No DRb server is running.")
+      end
+
+      it "returns the result from the DRb server call" do
+        @drb_object.should_receive(:run).and_return('foo')
+        DRbClient.run(@args, @error_stream, @out_stream).should == 'foo'
+      end
+
+    end
+  end
+end