Merge #159 'Remove the support for old style tag expressions'

Also update Changelog.md.

CHANGELOG.md

@@ -15,6 +15,10 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 
 * N/A
 
+### Removed
+
+* Remove the support for old style tag expressions ([#159](https://github.com/cucumber/cucumber-ruby-core/pull/159) @brasmusson)
+
 ### Improved
 
 * N/A

lib/cucumber/core/test/case.rb

@@ -2,7 +2,6 @@
 
 require 'cucumber/core/test/result'
 require 'cucumber/tag_expressions'
-require 'cucumber/core/gherkin/tag_expression'
 
 module Cucumber
   module Core
@@ -82,15 +81,7 @@ def compose_around_hooks(visitor, *args, &block)
         end
 
         def match_single_tag_expression?(expression)
-          if old_style_tag_expression?(expression)
-            Cucumber::Core::Gherkin::TagExpression.new([expression]).evaluate(tags)
-          else
-            Cucumber::TagExpressions::Parser.new.parse(expression).evaluate(tags.map(&:name))
-          end
-        end
-
-        def old_style_tag_expression?(expression)
-          expression.include?(',') || expression.include?('~')
+          Cucumber::TagExpressions::Parser.new.parse(expression).evaluate(tags.map(&:name))
         end
       end
     end

spec/cucumber/core/test/case_spec.rb

@@ -83,21 +83,6 @@ module Test
           end
         end
 
-        describe "matching tags (old style)" do
-          let(:tags) { ['@a', '@b', '@c'].map { |value| Tag.new(location, value) } }
-
-          it "matches boolean expressions of tags" do
-            expect( test_case.match_tags?(['@a', '@b']) ).to be_truthy
-            expect( test_case.match_tags?(['@a, @d']) ).to be_truthy
-            expect( test_case.match_tags?(['~@d']) ).to be_truthy
-            expect( test_case.match_tags?(['@a', '@d']) ).to be_falsy
-          end
-
-          it "handles mixing old and new style expressions" do
-            expect( test_case.match_tags?(['@a and @b', '~@d']) ).to be_truthy
-          end
-        end
-
         describe "matching names" do
           let(:name) { 'scenario' }
           it "matches names against regexp" do