cucumber 1.1.4 → 1.1.5

data/lib/cucumber/ast/background.rb

@@ -99,7 +99,7 @@ module Cucumber
       # Override this method, as there are situations where the background
       # wind up being the one called fore Before scenarios, and
       # backgrounds don't have tags.
-      def source_tag_names
+      def source_tags
         []
       end
 

data/lib/cucumber/ast/feature.rb

@@ -53,8 +53,8 @@ module Cucumber
         end.join("\n")
       end
 
-      def source_tag_names
-        @tags.tag_names
+      def source_tags
+        @tags.tags
       end
 
       def accept_hook?(hook)

data/lib/cucumber/ast/feature_element.rb

@@ -63,11 +63,11 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tag_names)
+        Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tags)
       end
 
-      def source_tag_names
-        (@tags.tag_names.to_a + (@feature ? @feature.source_tag_names.to_a : [])).uniq
+      def source_tags
+        (@tags.tags.to_a + (@feature ? @feature.source_tags.to_a : [])).uniq
       end
 
       def language

data/lib/cucumber/ast/outline_table.rb

@@ -34,8 +34,8 @@ module Cucumber
         @scenario_outline.accept_hook?(hook)
       end
       
-      def source_tag_names
-        @scenario_outline.source_tag_names
+      def source_tags
+        @scenario_outline.source_tags
       end
 
       def skip_invoke!
@@ -79,8 +79,8 @@ module Cucumber
           @scenario_exception = nil
         end
         
-        def source_tag_names
-          @table.source_tag_names
+        def source_tags
+          @table.source_tags
         end
 
         def create_step_invocations!(scenario_outline)

data/lib/cucumber/ast/tags.rb

@@ -3,25 +3,25 @@ require 'gherkin/tag_expression'
 module Cucumber
   module Ast
     class Tags #:nodoc:
-      attr_reader :tag_names
+      attr_reader :tags
 
-      def initialize(line, tag_names)
-        @line, @tag_names = line, tag_names
+      def initialize(line, tags)
+        @line, @tags = line, tags
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        @tag_names.each do |tag_name|
-          visitor.visit_tag_name(tag_name)
+        @tags.each do |tag|
+          visitor.visit_tag_name(tag.name)
         end
       end
 
       def accept_hook?(hook)
-        Gherkin::TagExpression.new(hook.tag_expressions).eval(@tag_names)
+        Gherkin::TagExpression.new(hook.tag_expressions).eval(@tags)
       end
 
       def to_sexp
-        @tag_names.map{|tag_name| [:tag, tag_name]}
+        @tags.map{|tag| [:tag, tag.name]}
       end
     end
   end

data/lib/cucumber/parser/gherkin_builder.rb

@@ -18,7 +18,7 @@ module Cucumber
         @feature = Ast::Feature.new(
           nil, 
           Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, feature.tags.map{|tag| tag.name}),
+          Ast::Tags.new(nil, feature.tags),
           feature.keyword,
           feature.name.lstrip,
           feature.description.rstrip,
@@ -47,7 +47,7 @@ module Cucumber
         scenario = Ast::Scenario.new(
           @background, 
           Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          Ast::Tags.new(nil, statement.tags), 
           statement.line, 
           statement.keyword, 
           statement.name,
@@ -64,7 +64,7 @@ module Cucumber
         scenario_outline = Ast::ScenarioOutline.new(
           @background, 
           Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          Ast::Tags.new(nil, statement.tags), 
           statement.line, 
           statement.keyword, 
           statement.name, 

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.1.4'
+  VERSION       = '1.1.5'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/runtime.rb

@@ -143,6 +143,7 @@ module Cucumber
               end
             end
           end
+          stepdef_hash['file_colon_line'] = stepdef.file_colon_line
           stepdef_hash['steps'] = steps.uniq.sort {|a,b| a['name'] <=> b['name']}
           stepdefs << stepdef_hash
         end

data/lib/cucumber/runtime/results.rb

@@ -54,11 +54,11 @@ module Cucumber
         if @configuration.wip?
           scenarios(:passed).any?
         else
-          scenarios(:failed).any? ||
+          scenarios(:failed).any? || steps(:failed).any? ||
           (@configuration.strict? && (steps(:undefined).any? || steps(:pending).any?))
         end
       end
     end
     
   end
-end
+end

data/lib/cucumber/wire_support/wire_protocol/requests.rb

@@ -94,13 +94,13 @@ module Cucumber
         end
       
         module Tags
-          def clean_tags(scenario)
-            scenario.source_tag_names.map { |tag| tag.gsub(/^@/, '') }.sort
+          def clean_tag_names(scenario)
+            scenario.source_tags.map { |tag| tag.name.gsub(/^@/, '') }.sort
           end
           
           def request_params(scenario)
-            return nil unless scenario.source_tag_names.any?
-            { "tags" => clean_tags(scenario) }
+            return nil unless scenario.source_tags.any?
+            { "tags" => clean_tag_names(scenario) }
           end
         end
       

data/spec/cucumber/ast/feature_factory.rb

@@ -1,5 +1,6 @@
 require 'cucumber/ast'
 require 'cucumber/step_mother'
+require 'gherkin/formatter/model'
 
 module Cucumber
   module Ast
@@ -35,14 +36,14 @@ module Cucumber
         f = Ast::Feature.new(
           background,
           Ast::Comment.new("# My feature comment\n"),
-          Ast::Tags.new(6, ['one', 'two']),
+          Ast::Tags.new(6, [Gherkin::Formatter::Model::Tag.new('one', 6), Gherkin::Formatter::Model::Tag.new('two', 6)]),
           "Feature",
           "Pretty printing",
           "",
           [Ast::Scenario.new(
             background,
             Ast::Comment.new("    # My scenario comment  \n# On two lines \n"),
-            Ast::Tags.new(8, ['three', 'four']),
+            Ast::Tags.new(8, [Gherkin::Formatter::Model::Tag.new('three', 8), Gherkin::Formatter::Model::Tag.new('four', 8)]),
             9,
             "Scenario:", "A Scenario", "",
             [

data/spec/cucumber/runtime/results_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+module Cucumber
+  describe Runtime::Results do
+
+    let(:configuration) {double 'Configuration', :strict? => false}
+    let(:passed_scenario) {double 'Scenario', :status => :passed}
+    let(:failed_scenario) {double 'Scenario', :status => :failed}
+    let(:passed_step) {double 'Step', :status => :passed}
+    let(:failed_step) {double 'Step', :status => :failed}
+    let(:pending_step) {double 'Step', :status => :pending}
+    let(:undefined_step) {double 'Step', :status => :undefined}
+
+    subject {described_class.new(configuration)}
+
+    describe '#failure?' do
+      context 'feature is not work in progress' do
+        before do
+          configuration.stub(:wip? => false)
+        end
+
+        it 'should return true if a scenario failed' do
+          subject.scenario_visited(passed_scenario)
+          subject.scenario_visited(failed_scenario)
+          subject.should be_failure
+        end
+        
+        it 'should return true if a step failed' do
+          subject.step_visited(failed_step)
+          subject.should be_failure
+        end
+        
+        it 'should return false if there are no scenarios' do
+          subject.should_not be_failure
+        end
+        
+        it 'should return false if all scenarios passed' do
+          subject.scenario_visited(passed_scenario)
+          subject.scenario_visited(passed_scenario)
+          subject.should_not be_failure
+        end
+
+        context 'configuration is strict' do
+          before do
+            configuration.stub(:strict? => true)
+          end
+
+          it 'should return true if a step is pending' do
+            subject.step_visited(pending_step)
+            subject.should be_failure
+          end
+          
+          it 'should return true if a step is undefined' do
+            subject.step_visited(undefined_step)
+            subject.should be_failure
+          end
+        end
+      end
+
+      context 'feature is work in progress' do
+        before do
+          configuration.stub(:wip? => true)
+        end
+
+        it 'should return true if a scenario passed' do
+          subject.scenario_visited(passed_scenario)
+          subject.should be_failure
+        end
+
+        it 'should return false if there are no scenarios' do
+          subject.should_not be_failure
+        end
+        
+        it 'should return false if all scenarios fail' do
+          subject.scenario_visited(failed_scenario)
+          subject.should_not be_failure
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2152976160 !ruby/object:Gem::Requirement
+  requirement: &2164552020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152976160
+  version_requirements: *2164552020
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152975480 !ruby/object:Gem::Requirement
+  requirement: &2164550820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152975480
+  version_requirements: *2164550820
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152974840 !ruby/object:Gem::Requirement
+  requirement: &2155974920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152974840
+  version_requirements: *2155974920
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &2152974060 !ruby/object:Gem::Requirement
+  requirement: &2155973800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152974060
+  version_requirements: *2155973800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152972000 !ruby/object:Gem::Requirement
+  requirement: &2155972580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152972000
+  version_requirements: *2155972580
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152971060 !ruby/object:Gem::Requirement
+  requirement: &2155971400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *2152971060
+  version_requirements: *2155971400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152969420 !ruby/object:Gem::Requirement
+  requirement: &2155969980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +87,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152969420
+  version_requirements: *2155969980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152967800 !ruby/object:Gem::Requirement
+  requirement: &2155936980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152967800
+  version_requirements: *2155936980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152965200 !ruby/object:Gem::Requirement
+  requirement: &2155935920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152965200
+  version_requirements: *2155935920
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2152963040 !ruby/object:Gem::Requirement
+  requirement: &2155933740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152963040
+  version_requirements: *2155933740
 - !ruby/object:Gem::Dependency
   name: prawn-layout
-  requirement: &2152962520 !ruby/object:Gem::Requirement
+  requirement: &2155932120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152962520
+  version_requirements: *2155932120
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &2152961880 !ruby/object:Gem::Requirement
+  requirement: &2155893700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152961880
+  version_requirements: *2155893700
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2152961000 !ruby/object:Gem::Requirement
+  requirement: &2155891440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *2152961000
+  version_requirements: *2155891440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152960180 !ruby/object:Gem::Requirement
+  requirement: &2155889880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,21 +164,21 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2152960180
+  version_requirements: *2155889880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152956980 !ruby/object:Gem::Requirement
+  requirement: &2155920980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *2152956980
+  version_requirements: *2155920980
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152954700 !ruby/object:Gem::Requirement
+  requirement: &2155917440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,21 +186,21 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152954700
+  version_requirements: *2155917440
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2152952800 !ruby/object:Gem::Requirement
+  requirement: &2155915120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152952800
+  version_requirements: *2155915120
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2152951700 !ruby/object:Gem::Requirement
+  requirement: &2156018920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152951700
+  version_requirements: *2156018920
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152949340 !ruby/object:Gem::Requirement
+  requirement: &2156017400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2152949340
+  version_requirements: *2156017400
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &2152947840 !ruby/object:Gem::Requirement
+  requirement: &2156016080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2152947840
+  version_requirements: *2156016080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152947100 !ruby/object:Gem::Requirement
+  requirement: &2156014260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2152947100
+  version_requirements: *2156014260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152946320 !ruby/object:Gem::Requirement
+  requirement: &2156012220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152946320
+  version_requirements: *2156012220
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables:
@@ -799,6 +799,7 @@ files:
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/rb_support/rb_transform_spec.rb
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
+- spec/cucumber/runtime/results_spec.rb
 - spec/cucumber/runtime/support_code_spec.rb
 - spec/cucumber/runtime_spec.rb
 - spec/cucumber/sell_cucumbers.feature
@@ -818,7 +819,7 @@ post_install_message: ! '
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
 
 
-  Thank you for installing cucumber-1.1.4.
+  Thank you for installing cucumber-1.1.5.
 
   Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading
 
@@ -839,18 +840,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4054116537034430329
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4054116537034430329
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: cucumber-1.1.4
+summary: cucumber-1.1.5
 test_files:
 - features/background.feature
 - features/bootstrap.feature
@@ -902,6 +909,7 @@ test_files:
 - spec/cucumber/rb_support/rb_step_definition_spec.rb
 - spec/cucumber/rb_support/rb_transform_spec.rb
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
+- spec/cucumber/runtime/results_spec.rb
 - spec/cucumber/runtime/support_code_spec.rb
 - spec/cucumber/runtime_spec.rb
 - spec/cucumber/sell_cucumbers.feature