cucumber 1.2.1 → 1.2.2

data/spec/cucumber/broadcaster_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
       @receiver = mock('receiver')
       @broadcaster = Broadcaster.new([@receiver])
     end
-    
+
     it "should broadcast methods to registered objects" do
       @receiver.should_receive(:konbanwa).with('good evening')
       @broadcaster.konbanwa('good evening')

data/spec/cucumber/cli/configuration_spec.rb

@@ -151,7 +151,7 @@ module Cli
       end
 
       it "parses ERB syntax in the cucumber.yml file" do
-        given_cucumber_yml_defined_as({'default' => '<%="--require some_file"%>'})
+        given_cucumber_yml_defined_as 'default' => "<%= '--require some_file' %>"
 
         config.parse!([])
         config.options[:require].should include('some_file')
@@ -402,7 +402,7 @@ END_OF_MESSAGE
       ENV["RAILS_ENV"].should == "selenium"
       config.feature_files.should_not include('RAILS_ENV=selenium')
     end
-    
+
     describe "#tag_expression" do
       include RSpec::WorkInProgress
 
@@ -420,13 +420,19 @@ END_OF_MESSAGE
         end
       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 true when --dry-run was specified in yaml file" do
+        given_cucumber_yml_defined_as({'default' => '--dry-run'})
+        config.parse!([])
+        config.dry_run?.should be_true
+      end
+
       it "returns false by default" do
         config.parse!([])
         config.dry_run?.should be_false

data/spec/cucumber/cli/drb_client_spec.rb

@@ -38,7 +38,7 @@ module Cucumber
       end
 
       context "with $CUCUMBER_DRB set" do
-        before do 
+        before do
           @original_env = ENV['CUCUMBER_DRB']
           ENV['CUCUMBER_DRB'] = '90000'
         end

data/spec/cucumber/cli/main_spec.rb

@@ -13,27 +13,27 @@ module Cucumber
         File.stub!(:exist?).and_return(false) # When Configuration checks for cucumber.yml
         Dir.stub!(:[]).and_return([]) # to prevent cucumber's features dir to being laoded
       end
-      
+
       let(:args)       { [] }
       let(:out_stream) { nil }
       let(:err_stream) { nil }
       subject { Main.new(args, out_stream, err_stream)}
-      
+
       describe "#execute!" do
         context "passed an existing runtime" do
           let(:existing_runtime) { double('runtime').as_null_object }
-          
+
           def do_execute
             subject.execute!(existing_runtime)
           end
-          
+
           it "configures that runtime" do
             expected_configuration = double('Configuration', :drb? => false).as_null_object
             Configuration.stub!(:new => expected_configuration)
             existing_runtime.should_receive(:configure).with(expected_configuration)
             do_execute
           end
-          
+
           it "uses that runtime for running and reporting results" do
             expected_results = double('results', :failure? => true)
             existing_runtime.should_receive(:run!)
@@ -41,6 +41,22 @@ module Cucumber
             do_execute.should == expected_results.failure?
           end
         end
+
+        context "interrupted with ctrl-c" do
+          after do
+            Cucumber.wants_to_quit = false
+          end
+
+          it "should register as a failure" do
+            results = double('results', :failure? => false)
+            runtime = Runtime.any_instance
+            runtime.stub(:run!)
+            runtime.stub(:results).and_return(results)
+
+            Cucumber.wants_to_quit = true
+            subject.execute!.should be_true
+          end
+        end
       end
 
       describe "verbose mode" do
@@ -73,8 +89,13 @@ module Cucumber
 
             f = stub('formatter').as_null_object
 
-            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 => f))
+            if Cucumber::RUBY_1_8_7
+              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 => f))
+            else
+              Object.should_receive(:const_get).with('ZooModule', false).and_return(mock_module)
+              mock_module.should_receive(:const_get).with('MonkeyFormatterClass', false).and_return(mock('formatter class', :new => f))
+            end
 
             cli.execute!
           end

data/spec/cucumber/cli/options_spec.rb

@@ -338,20 +338,20 @@ module Cli
 
     end
 
-    describe "dry-run" do 
+    describe "dry-run" do
       it "should have the default value for snippets" do
         given_cucumber_yml_defined_as({'foo' => %w[--dry-run]})
         options.parse!(%w{--dry-run})
         options[:snippets].should == true
       end
 
-      it "should set snippets to false when no-snippets provided after dry-run" do 
+      it "should set snippets to false when no-snippets provided after dry-run" do
         given_cucumber_yml_defined_as({'foo' => %w[--dry-run --no-snippets]})
         options.parse!(%w{--dry-run --no-snippets})
         options[:snippets].should == false
       end
 
-      it "should set snippets to false when no-snippets provided before dry-run" do 
+      it "should set snippets to false when no-snippets provided before dry-run" do
         given_cucumber_yml_defined_as({'foo' => %w[--no-snippet --dry-run]})
         options.parse!(%w{--no-snippets --dry-run})
         options[:snippets].should == false

data/spec/cucumber/configuration_spec.rb

@@ -4,20 +4,20 @@ module Cucumber
   describe Configuration do
     describe ".default" do
       subject { Configuration.default }
-      
+
       it "has an autoload_code_paths containing the standard support and step_definitions folders" do
         subject.autoload_code_paths.should include('features/support')
         subject.autoload_code_paths.should include('features/step_definitions')
       end
     end
-    
+
     describe "with custom user options" do
       let(:user_options) { { :autoload_code_paths => ['foo/bar/baz'] } }
       subject { Configuration.new(user_options) }
-      
+
       it "allows you to override the defaults" do
         subject.autoload_code_paths.should == ['foo/bar/baz']
       end
     end
   end
-end
+end

data/spec/cucumber/constantize_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+module Html end
+
 module Cucumber
   describe Constantize do
     include Constantize

data/spec/cucumber/core_ext/proc_spec.rb

@@ -6,7 +6,7 @@ describe Proc do
     proc = lambda {|a,b|}
     proc.file_colon_line.should =~ /^spec\/cucumber\/core_ext\/proc_spec\.rb:6/
   end
-  
+
   it "should raise ArityMismatchError for too many args (expecting 0)" do
     lambda {
       Object.new.cucumber_instance_exec(true, 'foo', 1) do
@@ -35,20 +35,20 @@ describe Proc do
     }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 2 arguments, but the Regexp matched 1 argument.")
   end
 
-  if Cucumber::RUBY_1_9
-    it "should allow varargs (expecting 0+)" do
+  if Cucumber::RUBY_1_8_7
+    # Ruby 1.8
+    it "should not allow varargs 0+ because Ruby 1.8 reports same arity as with no args, so we can't really tell the difference." do
       lambda {
         Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
         end
-      }.should_not raise_error(Cucumber::ArityMismatchError)
+      }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")
     end
   else
-    # Ruby 1.8
-    it "should not allow varargs 0+ because Ruby 1.8 reports same arity as with no args, so we can't really tell the difference." do
+    it "should allow varargs (expecting 0+)" do
       lambda {
         Object.new.cucumber_instance_exec(true, 'foo', 1) do |*args|
         end
-      }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")
+      }.should_not raise_error(Cucumber::ArityMismatchError)
     end
   end
 

data/spec/cucumber/formatter/ansicolor_spec.rb

@@ -5,7 +5,7 @@ module Cucumber
   module Formatter
     describe ANSIColor do
       include ANSIColor
-      
+
       it "should wrap passed_param with bold green and reset to green" do
         passed_param("foo").should == "\e[32m\e[1mfoo\e[0m\e[0m\e[32m"
       end
@@ -21,7 +21,7 @@ module Cucumber
       it "should wrap comments in grey" do
         comment("foo").should == "\e[90mfoo\e[0m"
       end
-      
+
       it "should not generate ansi codes when colors are disabled" do
         ::Cucumber::Term::ANSIColor.coloring = false
         passed("foo").should == "foo"

data/spec/cucumber/formatter/duration_spec.rb

@@ -5,7 +5,7 @@ module Cucumber
   module Formatter
     describe Duration do
       include Duration
-      
+
       it "should format ms" do
         format_duration(0.002103).should == '0m0.002s'
       end
@@ -19,4 +19,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/spec/cucumber/formatter/html_spec.rb

@@ -17,23 +17,23 @@ module Cucumber
           nodes.detect{ |node| node.text =~ regexp }
         end
       end
-    
+
       before(:each) do
         @out = StringIO.new
         @formatter = Html.new(step_mother, @out, {})
         step_mother.visitor = @formatter
       end
-    
+
       it "should not raise an error when visiting a blank feature name" do
         lambda { @formatter.feature_name("Feature", "") }.should_not raise_error
       end
-      
+
       describe "given a single feature" do
         before(:each) do
           run_defined_feature
           @doc = Nokogiri.HTML(@out.string)
         end
-        
+
         describe "basic feature" do
           define_feature <<-FEATURE
             Feature: Bananas
@@ -41,23 +41,23 @@ module Cucumber
               As a human
               I must eat bananas
           FEATURE
-                
+
           it "should output a main container div" do
             @out.string.should =~ /\<div class="cucumber"\>/
           end
         end
-        
+
         describe "with a comment" do
           define_feature <<-FEATURE
             # Healthy
             Feature: Foo
           FEATURE
-        
+
           it { @out.string.should =~ /^\<!DOCTYPE/ }
           it { @out.string.should =~ /\<\/html\>$/ }
           it { @doc.should have_css_node('.feature .comment', /Healthy/) }
         end
-      
+
         describe "with a tag" do
           define_feature <<-FEATURE
             @foo
@@ -66,7 +66,7 @@ module Cucumber
 
           it { @doc.should have_css_node('.feature .tag', /foo/) }
         end
-      
+
         describe "with a narrative" do
           define_feature <<-FEATURE
             Feature: Bananas
@@ -78,18 +78,18 @@ module Cucumber
           it { @doc.should have_css_node('.feature h2', /Bananas/) }
           it { @doc.should have_css_node('.feature .narrative', /must eat bananas/) }
         end
-      
+
         describe "with a background" do
           define_feature <<-FEATURE
             Feature: Bananas
-          
+
             Background:
               Given there are bananas
           FEATURE
 
           it { @doc.should have_css_node('.feature .background', /there are bananas/) }
         end
-      
+
         describe "with a scenario" do
           define_feature <<-FEATURE
           Feature: Banana party
@@ -101,14 +101,14 @@ module Cucumber
           it { @doc.should have_css_node('.feature h3', /Monkey eats banana/) }
           it { @doc.should have_css_node('.feature .scenario .step', /there are bananas/) }
         end
-      
+
         describe "with a scenario outline" do
           define_feature <<-FEATURE
           Feature: Fud Pyramid
 
             Scenario Outline: Monkey eats a balanced diet
               Given there are <Things>
-          
+
               Examples: Fruit
                | Things  |
                | apples  |
@@ -118,14 +118,14 @@ module Cucumber
                | broccoli |
                | carrots  |
           FEATURE
-        
+
           it { @doc.should have_css_node('.feature .scenario.outline h4', /Fruit/) }
           it { @doc.should have_css_node('.feature .scenario.outline h4', /Vegetables/) }
           it { @doc.css('.feature .scenario.outline h4').length.should == 2}
           it { @doc.should have_css_node('.feature .scenario.outline table', //) }
           it { @doc.should have_css_node('.feature .scenario.outline table td', /carrots/) }
         end
-      
+
         describe "with a step with a py string" do
           define_feature <<-FEATURE
           Feature: Traveling circus
@@ -136,7 +136,7 @@ module Cucumber
                foo
                """
           FEATURE
-        
+
           it { @doc.should have_css_node('.feature .scenario .val', /foo/) }
         end
 
@@ -150,10 +150,10 @@ module Cucumber
                | foo  |
                | bar  |
           FEATURE
-        
+
           it { @doc.should have_css_node('.feature .scenario table td', /foo/) }
         end
-      
+
         describe "with a table in the background and the scenario" do
           define_feature <<-FEATURE
           Feature: accountant monkey
@@ -167,10 +167,10 @@ module Cucumber
                | e | f |
                | g | h |
           FEATURE
-        
+
           it { @doc.css('td').length.should == 8 }
         end
-      
+
         describe "with a py string in the background and the scenario" do
           define_feature <<-FEATURE
           Feature: py strings
@@ -190,12 +190,12 @@ module Cucumber
           it { @doc.css('.feature .background pre.val').length.should == 1 }
           it { @doc.css('.feature .scenario pre.val').length.should == 1 }
         end
-      
+
         describe "with a step that fails in the scenario" do
           define_steps do
             Given(/boo/) { raise StandardError, 'eek'.freeze }
           end
-        
+
           define_feature(<<-FEATURE)
           Feature: Animal Cruelty
 
@@ -206,12 +206,12 @@ module Cucumber
           it { @doc.should have_css_node('.feature .scenario .step.failed .message', /eek/) }
           it { @doc.should have_css_node('.feature .scenario .step.failed .message', /StandardError/) }
         end
-      
+
         describe "with a step that fails in the backgound" do
           define_steps do
             Given(/boo/) { raise 'eek' }
           end
-        
+
           define_feature(<<-FEATURE)
           Feature: shouting
             Background:
@@ -219,7 +219,7 @@ module Cucumber
             Scenario:
               Given yay
             FEATURE
-        
+
           it { @doc.should have_css_node('.feature .background .step.failed', /eek/) }
           it { @doc.should_not have_css_node('.feature .scenario .step.failed', //) }
           it { @doc.should have_css_node('.feature .scenario .step.undefined', /yay/) }
@@ -231,25 +231,25 @@ module Cucumber
           end
 
           define_feature(<<-FEATURE)
-          Feature: 
+          Feature:
             Scenario:
               Given snap
             FEATURE
 
           it { @doc.css('.embed img').first.attributes['src'].to_s.should == "snapshot.jpeg" }
         end
-        
+
         describe "with an undefined Given step then an undefined And step" do
           define_feature(<<-FEATURE)
-          Feature: 
+          Feature:
             Scenario:
               Given some undefined step
               And another undefined step
             FEATURE
-            
+
           it { @doc.css('pre').map { |pre| /^(Given|And)/.match(pre.text)[1] }.should == ["Given", "Given"] }
         end
-      
+
       end
     end
   end