cucumber-core 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2cd168ae1424fa32f265677b4a2dfc7ae18a94d
-  data.tar.gz: ebbf8b1933b4bb5e7cc16bce682ee62c5887a19c
+  metadata.gz: a5c7dce2de4429c75212c41a7d68768df625b22e
+  data.tar.gz: a1b973e289c386411ec84f27cc83db1b2ad4e147
 SHA512:
-  metadata.gz: 2ed2fa52877d2ddae9912e9a4db6c2c019bebd424709b759997826ef7d5e061d01a5a31c8f37829b33dc8ba32b9969b6003fc3d65eeaa5403af9845424fb613d
-  data.tar.gz: c63b934c43c8e8e57869d8f52db24f4e1dd6fa6352c1a1e69569a290eb70f6a71f8a3ac37da0b7b7b208996e32b621f26698c1fda2470e763a7f4e5eab40bad6
+  metadata.gz: 20196a25adcfb5fe2bba86beb60ac8d1e8472e89b280add560da96737cb2e1bdb8b0c6a60e9438dc981a74669629dbb0f9336c34fcb502a8b55b5cffdfa92e0c
+  data.tar.gz: d01388ba71e8e2e09f7286d1425406db8f0d72b44805d49261eec7b6e0be2b934c10e6cc465f04a81893c2688f2293d7774bc9c330d1dcba26c9a174c79f132f

data/HISTORY.md

@@ -1,4 +1,10 @@
-## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0...master)
+## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.1.0...master)
+
+## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0...v1.1.0)
+
+### New features
+
+  * LocationsFilter now sorts test cases as well as filtering them (@mattwynne)
 
 ## [v1.0.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0.beta.4...v1.0.0)
 

data/lib/cucumber/core/ast/doc_string.rb

@@ -50,7 +50,7 @@ module Cucumber
           if other.respond_to?(:to_str)
             return content == other.to_str
           end
-          raise ArgumentError, "Can't compare a #{self.class.name} with a #{other.class.name}"
+          false
         end
 
         private

data/lib/cucumber/core/gherkin/writer/helpers.rb

@@ -62,12 +62,7 @@ module Cucumber
           end
 
           def slurp_comments
-            # TODO: I can't think of another way to handle this?
-            # When we use the comments, we need to reset the collection
-            # for the next element...
-            slurped_comments = comment_lines.dup
-            @comment_lines = nil
-            slurped_comments
+            comment_lines.tap { @comment_lines = nil }
           end
         end
 

data/lib/cucumber/core/test/filters/locations_filter.rb

@@ -3,15 +3,39 @@ require 'cucumber/core/filter'
 module Cucumber
   module Core
     module Test
+
+      # Sorts and filters scenarios based on a list of locations
       class LocationsFilter < Filter.new(:locations)
 
         def test_case(test_case)
-          if test_case.match_locations?(@locations)
-            test_case.describe_to @receiver
+          test_cases << test_case
+          self
+        end
+
+        def done
+          sorted_test_cases.each do |test_case|
+            test_case.describe_to receiver
           end
+          receiver.done
           self
         end
 
+        private
+
+        def sorted_test_cases
+          locations.map { |location| test_cases_matching(location) }.flatten
+        end
+
+        def test_cases_matching(location)
+          test_cases.select do |test_case|
+            test_case.match_locations?([location])
+          end
+        end
+
+        def test_cases
+          @test_cases ||= []
+        end
+
       end
     end
   end

data/lib/cucumber/core/version.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Core
     class Version
       def self.to_s
-        "1.0.0"
+        "1.1.0"
       end
     end
   end

data/spec/cucumber/core/ast/doc_string_spec.rb

@@ -45,8 +45,8 @@ module Cucumber
             expect( doc_string ).to eq 'foo'
           end
 
-          it 'raises an error when compared with something odd' do
-            expect { doc_string == 5 }.to raise_error(ArgumentError)
+          it 'returns false when compared with something odd' do
+            expect( doc_string ).not_to eq 5
           end
         end
 

data/spec/cucumber/core/test/filters/locations_filter_spec.rb

@@ -0,0 +1,74 @@
+require 'cucumber/core/gherkin/writer'
+require 'cucumber/core'
+require 'cucumber/core/test/filters/locations_filter'
+
+module Cucumber::Core::Test
+  describe LocationsFilter do
+    include Cucumber::Core::Gherkin::Writer
+    include Cucumber::Core
+
+    let(:receiver) { SpyReceiver.new }
+
+    let(:doc) do
+      gherkin do
+        feature do
+          scenario 'x' do
+            step 'a step'
+          end
+
+          scenario 'y' do
+            step 'a step'
+          end
+        end
+      end
+    end
+
+    it "sorts by the given locations" do
+      locations = [
+        Cucumber::Core::Ast::Location.new('features/test.feature', 6),
+        Cucumber::Core::Ast::Location.new('features/test.feature', 3)
+      ]
+      filter = LocationsFilter.new(locations)
+      compile [doc], receiver, [filter]
+      expect(receiver.test_case_locations).to eq ["features/test.feature:6", "features/test.feature:3"]
+    end
+
+    it "works with wildcard locations" do
+      locations = [
+        Cucumber::Core::Ast::Location.new('features/test.feature')
+      ]
+      filter = LocationsFilter.new(locations)
+      compile [doc], receiver, [filter]
+      expect(receiver.test_case_locations).to eq ["features/test.feature:3", "features/test.feature:6"]
+    end
+
+    it "filters out scenarios that don't match" do
+      locations = [
+        Cucumber::Core::Ast::Location.new('features/test.feature', 3)
+      ]
+      filter = LocationsFilter.new(locations)
+      compile [doc], receiver, [filter]
+      expect(receiver.test_case_locations).to eq ["features/test.feature:3"]
+    end
+
+    class SpyReceiver
+      def test_case(test_case)
+        test_cases << test_case
+      end
+
+      def done
+      end
+
+      def test_case_locations
+        test_cases.map(&:location).map(&:to_s)
+      end
+
+      private
+
+      def test_cases
+        @test_cases ||= []
+      end
+
+    end
+  end
+end

data/spec/cucumber/core_spec.rb

@@ -334,31 +334,6 @@ module Cucumber
         expect( report.test_cases.total ).to eq 1
       end
 
-      it "filters test cases by filename" do
-        documents = []
-        documents << gherkin("some.feature") do
-          feature 'some feature' do
-            scenario 'some scenario' do
-              step 'missing'
-            end
-          end
-        end
-        documents << gherkin("other.feature") do
-          feature 'other feature' do
-            scenario 'other scenario' do
-              step 'missing'
-            end
-          end
-        end
-
-        report = Core::Report::Summary.new
-        some_feature = Cucumber::Core::Ast::Location.new("some.feature")
-        filters = [ Cucumber::Core::Test::LocationsFilter.new([some_feature]) ]
-
-        execute documents, report, filters
-
-        expect( report.test_cases.total ).to eq 1
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -184,6 +184,7 @@ files:
 - spec/cucumber/core/test/action_spec.rb
 - spec/cucumber/core/test/case_spec.rb
 - spec/cucumber/core/test/duration_matcher.rb
+- spec/cucumber/core/test/filters/locations_filter_spec.rb
 - spec/cucumber/core/test/result_spec.rb
 - spec/cucumber/core/test/runner_spec.rb
 - spec/cucumber/core/test/step_spec.rb
@@ -212,10 +213,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: cucumber-core-1.0.0
+summary: cucumber-core-1.1.0
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
@@ -232,6 +233,7 @@ test_files:
 - spec/cucumber/core/test/action_spec.rb
 - spec/cucumber/core/test/case_spec.rb
 - spec/cucumber/core/test/duration_matcher.rb
+- spec/cucumber/core/test/filters/locations_filter_spec.rb
 - spec/cucumber/core/test/result_spec.rb
 - spec/cucumber/core/test/runner_spec.rb
 - spec/cucumber/core/test/step_spec.rb
@@ -239,3 +241,4 @@ test_files:
 - spec/cucumber/core_spec.rb
 - spec/readme_spec.rb
 - spec/report_api_spy.rb
+has_rdoc: