Group feature tags when filtering scenarios.

gherkin/types.go

@@ -175,8 +175,11 @@ func (f *Feature) FilterMatched(filters ...string) bool {
 }
 
 // FilterMatched returns true if the set of input filters match the feature's tags.
-func (s *Scenario) FilterMatched(filters ...string) bool {
-	return matchTags(s.Tags, filters)
+func (s *Scenario) FilterMatched(f *Feature, filters ...string) bool {
+	t := []string{}
+	t = append(t, f.Tags...)
+	t = append(t, s.Tags...)
+	return matchTags(t, filters)
 }
 
 func matchTags(tags []string, filters []string) bool {

runner.go

@@ -171,7 +171,7 @@ func (c *Runner) runFeature(f *gherkin.Feature) {
 
 		// if any scenarios match, we will run those
 		for _, s := range f.Scenarios {
-			if s.FilterMatched(c.Filters...) {
+			if s.FilterMatched(f, c.Filters...) {
 				result = true
 				break
 			}
@@ -209,12 +209,12 @@ func (c *Runner) runFeature(f *gherkin.Feature) {
 }
 
 func (c *Runner) runScenario(title string, f *gherkin.Feature, s *gherkin.Scenario, isExample bool) {
-	if !s.FilterMatched(c.Filters...) {
+	if !s.FilterMatched(f, c.Filters...) {
 		return
 	}
 
 	for k, fn := range c.BeforeFilters {
-		if s.FilterMatched(strings.Split(k, "|")...) {
+		if s.FilterMatched(f, strings.Split(k, "|")...) {
 			fn()
 		}
 	}
@@ -266,7 +266,7 @@ func (c *Runner) runScenario(title string, f *gherkin.Feature, s *gherkin.Scenar
 		c.line(clrWhite, "")
 
 		for k, fn := range c.AfterFilters {
-			if s.FilterMatched(strings.Split(k, "|")...) {
+			if s.FilterMatched(f, strings.Split(k, "|")...) {
 				fn()
 			}
 		}
@@ -350,7 +350,7 @@ func (c *Runner) runScenario(title string, f *gherkin.Feature, s *gherkin.Scenar
 	}
 
 	for k, fn := range c.AfterFilters {
-		if s.FilterMatched(strings.Split(k, "|")...) {
+		if s.FilterMatched(f, strings.Split(k, "|")...) {
 			fn()
 		}
 	}