jwilger-cucumber 0.3.11.200906161550 → 0.3.11.200907091518

data/lib/cucumber/filter.rb

@@ -32,7 +32,7 @@ module Cucumber
     end
 
     def included_by_tags?(syntax_node)
-      @include_tags.empty? || syntax_node.has_tags?(@include_tags)
+      @include_tags.empty? || syntax_node.has_all_tags?(@include_tags)
     end
 
     def excluded_by_tags?(syntax_node)
@@ -47,4 +47,4 @@ module Cucumber
       @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
     end
   end
-end
+end

data/lib/cucumber/parser/feature.rb

@@ -55,6 +55,10 @@ module Cucumber
         def has_tags?(tag_names)
           tags.has_tags?(tag_names)
         end
+
+        def has_all_tags?(tag_names)
+          tags.has_all_tags?(tag_names)
+        end
         
         def build(filter)
           if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
@@ -211,6 +215,10 @@ module Cucumber
           ts.elements.detect{|e| e.tag.line == line}
         end
 
+        def has_all_tags?(tags)
+          (tags & tag_names) == tags
+        end
+
         def has_tags?(tags)
           (tag_names & tags).any?
         end
@@ -491,6 +499,11 @@ module Cucumber
           feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.tags
+          feature_tags.has_all_tags?(tag_names)
+        end
+
         def build
           Ast::Background.new(
             comment.build, 
@@ -688,6 +701,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
@@ -826,6 +844,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
         end
@@ -1162,6 +1185,10 @@ module Cucumber
           true
         end
 
+        def has_all_tags?(tag_names)
+          true
+        end
+
         def outline_at_line?(line)
           true
         end

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 3
     TINY  = 11
-    PATCH = 200906161550 # Set to nil for official release
+    PATCH = 200907091518 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jwilger-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.11.200906161550
+  version: 0.3.11.200907091518
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency