cucumber 0.8.6 → 0.8.7

data/spec/cucumber/cli/configuration_spec.rb

@@ -1,12 +1,9 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber
 module Cli
   describe Configuration do
-    module ExposesOptions
-      attr_reader :options
-    end
 
     def given_cucumber_yml_defined_as(hash_or_string)
       File.stub!(:exist?).and_return(true)
@@ -26,7 +23,7 @@ module Cli
     end
 
     def config
-      @config ||= Configuration.new(@out = StringIO.new, @error = StringIO.new).extend(ExposesOptions)
+      @config ||= Configuration.new(@out = StringIO.new, @error = StringIO.new)
     end
 
     def reset_config
@@ -290,17 +287,17 @@ END_OF_MESSAGE
 
     it "should accept --out option" do
       config.parse!(%w{--out jalla.txt})
-      config.formats.should == [['pretty', 'jalla.txt']]
+      config.options[:formats].should == [['pretty', 'jalla.txt']]
     end
 
     it "should accept multiple --out options" do
       config.parse!(%w{--format progress --out file1 --out file2})
-      config.formats.should == [['progress', 'file2']]
+      config.options[:formats].should == [['progress', 'file2']]
     end
 
     it "should accept multiple --format options and put the STDOUT one first so progress is seen" do
       config.parse!(%w{--format pretty --out pretty.txt --format progress})
-      config.formats.should == [['progress', out], ['pretty', 'pretty.txt']]
+      config.options[:formats].should == [['progress', out], ['pretty', 'pretty.txt']]
     end
 
     it "should not accept multiple --format options when both use implicit STDOUT" do
@@ -317,7 +314,7 @@ END_OF_MESSAGE
 
     it "should associate --out to previous --format" do
       config.parse!(%w{--format progress --out file1 --format profile --out file2})
-      config.formats.should == [["progress", "file1"], ["profile" ,"file2"]]
+      config.options[:formats].should == [["progress", "file1"], ["profile" ,"file2"]]
     end
 
     it "should accept --color option" do
@@ -402,30 +399,7 @@ END_OF_MESSAGE
       ENV["RAILS_ENV"].should == "selenium"
       config.feature_files.should_not include('RAILS_ENV=selenium')
     end
-    
-    describe "#tag_expression" do
-      it "returns an empty expression when no tags are specified" do
-        config.parse!([])
-        config.tag_expression.should be_empty
-      end
 
-      it "returns an expression when tags are specified" do
-        config.parse!(['--tags','@foo'])
-        config.tag_expression.should_not be_empty
-      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 false by default" do
-        config.parse!([])
-        config.dry_run?.should be_false
-      end
-    end
   end
 end
 end

data/spec/cucumber/cli/drb_client_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
 
 module Cucumber
   module Cli
@@ -29,7 +30,7 @@ module Cucumber
 
       it "returns raises an error when it can't connect to the server" do
         DRbObject.stub!(:new_with_uri).and_raise(DRb::DRbConnError)
-        lambda { DRbClient.run(@args, @error_stream, @out_stream) }.should raise_error(DRbClientError, "No DRb server is running.")
+        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

data/spec/cucumber/cli/main_spec.rb

@@ -1,7 +1,5 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
-require 'cucumber/parser/gherkin_builder'
-require 'gherkin/formatter/model'
 
 module Cucumber
   module Cli
@@ -13,41 +11,11 @@ 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!)
-            existing_runtime.stub!(:results).and_return(expected_results)
-            do_execute.should == expected_results.failure?
-          end
-        end
-      end
 
       describe "verbose mode" do
 
         before(:each) do
-          b = Cucumber::Parser::GherkinBuilder.new
-          @empty_feature = b.feature(Gherkin::Formatter::Model::Feature.new([], [], "Feature", "Foo", "", 99))
+          @empty_feature = Cucumber::Ast::Feature.new(nil, Cucumber::Ast::Comment.new(''), Cucumber::Ast::Tags.new(2, []), "Feature", "Foo", [])
         end
 
         it "should show feature files parsed" do
@@ -56,7 +24,7 @@ module Cucumber
 
           Cucumber::FeatureFile.stub!(:new).and_return(mock("feature file", :parse => @empty_feature))
 
-          @cli.execute!
+          @cli.execute!(Cucumber::StepMother.new)
 
           @out.string.should include('example.feature')
         end
@@ -64,7 +32,9 @@ module Cucumber
       end
 
       describe "--format with class" do
-        describe "in module" do
+
+       describe "in module" do
+
           it "should resolve each module until it gets Formatter class" do
             cli = Main.new(%w{--format ZooModule::MonkeyFormatterClass}, nil)
             mock_module = mock('module')
@@ -76,11 +46,42 @@ module Cucumber
             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))
 
-            cli.execute!
+            cli.execute!(Cucumber::StepMother.new)
           end
+
         end
       end
 
+      describe "setup step sequence" do
+        
+        it "should load files and execute hooks in order" do
+          Configuration.stub!(:new).and_return(configuration = mock('configuration').as_null_object)
+          step_mother = mock('step mother').as_null_object
+          configuration.stub!(:drb?).and_return false
+          cli = Main.new(%w{--verbose example.feature}, @out)
+          cli.stub!(:require)
+          
+          configuration.stub!(:support_to_load).and_return(['support'])
+          configuration.stub!(:step_defs_to_load).and_return(['step defs'])
+          
+          # Support must be loaded first to ensure post configuration hook can
+          # run before anything else.
+          step_mother.should_receive(:load_code_files).with(['support']).ordered
+          # The post configuration hook/s (if any) need to be run next to enable
+          # extensions to do their thing before features are loaded
+          step_mother.should_receive(:after_configuration).with(configuration).ordered
+          # Feature files must be loaded before step definitions are required.
+          # This is because i18n step methods are only aliased when
+          # features are loaded. If we swap the order, the requires
+          # will fail.
+          step_mother.should_receive(:load_plain_text_features).ordered
+          step_mother.should_receive(:load_code_files).with(['step defs']).ordered
+
+          cli.execute!(step_mother)
+        end
+        
+      end
+      
       [ProfilesNotDefinedError, YmlLoadError, ProfileNotFound].each do |exception_klass|
 
         it "rescues #{exception_klass}, prints the message to the error stream and returns true" do
@@ -88,7 +89,7 @@ module Cucumber
           configuration.stub!(:parse!).and_raise(exception_klass.new("error message"))
 
           main = Main.new('', out = StringIO.new, error = StringIO.new)
-          main.execute!.should be_true
+          main.execute!(Cucumber::StepMother.new).should be_true
           error.string.should == "error message\n"
         end
       end
@@ -102,31 +103,30 @@ module Cucumber
 
           @cli = Main.new(@args, @out, @err)
           @step_mother = mock('StepMother').as_null_object
-          StepMother.stub!(:new).and_return(@step_mother)
         end
 
         it "delegates the execution to the DRB client passing the args and streams" do
           @configuration.stub :drb_port => 1450
           DRbClient.should_receive(:run).with(@args, @err, @out, 1450).and_return(true)
-          @cli.execute!
+          @cli.execute!(@step_mother)
         end
 
         it "returns the result from the DRbClient" do
           DRbClient.stub!(:run).and_return('foo')
-          @cli.execute!.should == 'foo'
+          @cli.execute!(@step_mother).should == 'foo'
         end
 
         it "ceases execution if the DrbClient is able to perform the execution" do
           DRbClient.stub!(:run).and_return(true)
           @configuration.should_not_receive(:build_formatter_broadcaster)
-          @cli.execute!
+          @cli.execute!(@step_mother)
         end
 
         context "when the DrbClient is unable to perfrom the execution" do
           before { DRbClient.stub!(:run).and_raise(DRbClientError.new('error message.')) }
 
           it "alerts the user that execution will be performed locally" do
-            @cli.execute!
+            @cli.execute!(@step_mother)
             @err.string.should include("WARNING: error message. Running features locally:")
           end
 

data/spec/cucumber/cli/options_spec.rb

@@ -1,6 +1,5 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
-require 'cucumber/cli/options'
 
 module Cucumber
 module Cli
@@ -112,13 +111,6 @@ module Cli
         end
       end
 
-      context '-l LINES or --lines LINES' do
-        it "adds line numbers to args" do
-          options.parse!(%w{-l24 FILE})
-          options.instance_variable_get(:@args).should == ['FILE:24']
-        end
-      end
-
       context '-p PROFILE or --profile PROFILE' do
 
         it "notifies the user that an individual profile is being used" do
@@ -332,25 +324,6 @@ module Cli
 
     end
 
-    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 
-        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 
-        given_cucumber_yml_defined_as({'foo' => %w[--no-snippet --dry-run]})
-        options.parse!(%w{--no-snippets --dry-run})
-        options[:snippets].should == false
-      end
-    end
   end
 
 end

data/spec/cucumber/cli/profile_loader_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber

data/spec/cucumber/core_ext/proc_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/core_ext/proc'
 
 describe Proc do

data/spec/cucumber/formatter/ansicolor_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/ansicolor'
 
 module Cucumber

data/spec/cucumber/formatter/color_io_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'cucumber/formatter/color_io'
+
+module Cucumber
+  module Formatter
+    describe ColorIO do
+      describe "<<" do
+        it "should convert to a print using kernel" do
+          kernel = mock('Kernel')
+          color_io = ColorIO.new(kernel, nil)
+          
+          kernel.should_receive(:print).with("monkeys")
+          
+          color_io << "monkeys"
+        end
+        
+        it "should allow chained <<" do
+          kernel = mock('Kernel')
+          color_io = ColorIO.new(kernel, nil)
+
+          kernel.should_receive(:print).with("monkeys")
+          kernel.should_receive(:print).with(" are tasty")
+          
+          color_io << "monkeys" <<  " are tasty"
+        end
+      end
+    end
+  end
+end

data/spec/cucumber/formatter/duration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/duration'
 
 module Cucumber

data/spec/cucumber/formatter/html_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'cucumber/formatter/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'cucumber/formatter/html'
 require 'nokogiri'
 require 'cucumber/rb_support/rb_language'
@@ -11,7 +11,9 @@ module Cucumber
       extend SpecHelperDsl
       include SpecHelper
 
-      RSpec::Matchers.define :have_css_node do |css, regexp|
+      matcher = defined?(Spec::Matchers) ? Spec::Matchers : RSpec::Matchers
+
+      matcher.define :have_css_node do |css, regexp|
         match do |doc|
           nodes = doc.css(css)
           nodes.detect{ |node| node.text =~ regexp }

data/spec/cucumber/formatter/junit_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'cucumber/formatter/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'cucumber/formatter/junit'
 require 'nokogiri'
@@ -51,19 +51,6 @@ module Cucumber::Formatter
         
         it { @doc.to_s.should =~ /One passing scenario, one failing scenario/ }
       end
-
-      describe "with a scenario in a subdirectory" do
-        define_feature %{
-          Feature: One passing scenario, one failing scenario
-
-            Scenario: Passing
-              Given a passing scenario
-        }, File.join('features', 'some', 'path', 'spec.feature')
-
-        it 'writes the filename including the subdirectory' do
-          @formatter.written_files.keys.first.should == File.join('', 'TEST-some_path_spec.xml')
-        end
-      end
       
       describe "with a scenario outline table" do
         define_steps do
@@ -94,7 +81,6 @@ module Cucumber::Formatter
         it { @doc.to_s.should =~ /Big Mac/ }
         it { @doc.to_s.should_not =~ /Things/ }
         it { @doc.to_s.should_not =~ /Good|Evil/ }
-        it { @doc.to_s.should_not =~ /type="skipped"/}
       end
   
       describe "with a regular data table scenario" do

data/spec/cucumber/formatter/progress_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'cucumber/formatter/progress'
 
 module Cucumber

data/spec/cucumber/formatter/spec_helper.rb

@@ -2,11 +2,10 @@ module Cucumber
   module Formatter
 
     module SpecHelperDsl
-      attr_reader :feature_content, :step_defs, :feature_filename
+      attr_reader :feature_content, :step_defs
     
-      def define_feature(string, feature_file = 'spec.feature')
+      def define_feature(string)
         @feature_content = string
-        @feature_filename = feature_file
       end
     
       def define_steps(&block)
@@ -22,31 +21,33 @@ module Cucumber
       end
       
       def step_mother
-        @step_mother ||= Runtime.new
+        @step_mother ||= StepMother.new
       end
       
       def load_features(content)
-        feature_file = FeatureFile.new(self.class.feature_filename, content)
+        feature_file = FeatureFile.new('spec.feature', content)
         features = Ast::Features.new
-        filters = []
-        feature = feature_file.parse(filters, {})
+        feature = feature_file.parse(options, {})
         features.add_feature(feature) if feature
         features
       end
     
       def run(features)
-        configuration = Cucumber::Configuration.default
-        tree_walker = Cucumber::Ast::TreeWalker.new(step_mother, [@formatter], configuration)
+        tree_walker = Cucumber::Ast::TreeWalker.new(@step_mother, [@formatter], options, STDOUT)
         tree_walker.visit_features(features)
       end
     
       def define_steps
         return unless step_defs = self.class.step_defs
-        rb = step_mother.load_programming_language('rb')
-        dsl = Object.new
+        rb = @step_mother.load_programming_language('rb')
+        dsl = Object.new 
         dsl.extend RbSupport::RbDsl
         dsl.instance_exec &step_defs
       end 
+
+      def options
+        @options ||= mock(Cucumber::Cli::Options, :filters => [], :[] => nil)
+      end
     end
   end
 end