Skip to content
This repository
Browse code

Merge branch 'master' of https://github.com/crunchy/cucumber into bug-96

  • Loading branch information...
commit 7f808b25b948b3dfe21d554e077747bf724b28c9 2 parents e4d85c4 + 160f465
Aslak Hellesøy authored September 11, 2011
4  lib/cucumber/ast/feature.rb
@@ -5,7 +5,7 @@ module Ast
5 5
     # Represents the root node of a parsed feature.
6 6
     class Feature #:nodoc:
7 7
       include Names
8  
-      
  8
+
9 9
       attr_accessor :language
10 10
       attr_writer :features, :background
11 11
       attr_reader :file
@@ -76,7 +76,7 @@ def file=(file)
76 76
         file = file.gsub(/\//, '\\') if Cucumber::WINDOWS && file && !ENV['CUCUMBER_FORWARD_SLASH_PATHS']
77 77
         @file = file
78 78
       end
79  
-      
  79
+
80 80
       def file_colon_line(line)
81 81
         "#{@file}:#{line}"
82 82
       end
2  lib/cucumber/ast/feature_element.rb
@@ -67,7 +67,7 @@ def accept_hook?(hook)
67 67
       end
68 68
 
69 69
       def source_tag_names
70  
-        (@tags.tag_names.to_a + (@feature ? @feature.source_tag_names.to_a : [])).uniq
  70
+        (@tags ? @tags.tag_names.to_a : [] + (@feature ? @feature.source_tag_names.to_a : [])).uniq
71 71
       end
72 72
 
73 73
       def language

0 notes on commit 7f808b2

Please sign in to comment.
Something went wrong with that request. Please try again.