cucumber-core 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5590978fbb346277b5a34ddc978ff2ba13521bd2
-  data.tar.gz: dfd394bd74736d25cf4e09eba613d292692fa6b8
+  metadata.gz: c1fc45a561bb99340344287c1e671c9cdfe5c3e7
+  data.tar.gz: 71d6d270193517dec221d7a61a557abae8bdbeb0
 SHA512:
-  metadata.gz: e450582697d48dc63fce47bb733786d45ac3214fbd9eac75399ec7d22ceebe6e1d91d15a86eec542da3c6af6b1ffe194c20b78997a667b0fc5b43073e9ed29b8
-  data.tar.gz: f454b32d9b6407f474102d9d71073b78c6181679f604f47e0592d5cb4df47970ff8c94af2c2c36291ce24da39fd3b2858ddff55045f43ad97756e32e4500362b
+  metadata.gz: 39f345c74c57332f0022faaab37e74cbb6029d544551435a9ab0b2986af82c4c6c33f13554315bf5a01fe5e00760bedbcb131cc9454fceac38025933dd93e07d
+  data.tar.gz: 3dfc0894b9e62ecffc08f39b85acc0bfd4ddea7e5bda3ebd11a7fe164011a383e667abee3c0158268b2fcca35607c7c3bb433c338a8ddae731fb63248867ecad

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
 branches:
   only:
     - master
+    - v1.x-bugfix
 
 notifications:
   email:

data/HISTORY.md

@@ -1,9 +1,19 @@
-## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.4.0...master)
+## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.5.0...v1.x-bugfix)
 
 ### New Features
 
 ### Bugfixes
 
+## [v1.5.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.4.0...v1.5.0)
+
+### New Features
+
+ * Update to Gherkin v4.0 (@brasmusson)
+
+### Bugfixes
+
+ * Use monotonic time ([#103](https://github.com/cucumber/cucumber-ruby-core/pull/103) @mikz)
+
 ## [v1.4.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.3.1...v1.4.0)
 
 ### New Features
@@ -18,7 +28,7 @@
 
 ### Bugfixes
 
- * Speed up location filtering ([99](https://github.com/cucumber/cucumber-ruby-core/issues/99) @mattwynne @akostadinov @brasmusson)
+ * Speed up location filtering ([#99](https://github.com/cucumber/cucumber-ruby-core/issues/99) @mattwynne @akostadinov @brasmusson)
 
 ## [v1.3.0](https://github.com/cucumber/cucumber-ruby-core/compare/v1.2.0...v1.3.0)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2013 The Cucumber Organisation
+Copyright (C) The Cucumber Organisation
 
 MIT License (Expat)
 

data/README.md

@@ -126,4 +126,4 @@ undefined ?
 
 ## Copyright
 
-Copyright (c) 2013-2014 Cucumber Limited.
+Copyright (c) Cucumber Limited.

data/cucumber-core.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency 'gherkin', '~> 3.2.0'
+  s.add_dependency 'gherkin', '~> 4.0'
 
   s.add_development_dependency 'bundler',   '>= 1.3.5'
   s.add_development_dependency 'rake',      '>= 0.9.2'

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

@@ -16,20 +16,20 @@ module Cucumber
                     :comments, :tags, :keyword, :description,
                     :feature_elements
 
-        def initialize(language, location, background, comments, tags, keyword, name, description, scenario_definitions)
+        def initialize(language, location, comments, tags, keyword, name, description, feature_elements)
           @language = language
           @location = location
-          @background = background
+          @background = BackgroundFinder.new(feature_elements).result
           @comments = comments
           @tags = tags
           @keyword = keyword
           @name = name
           @description = description
-          @feature_elements = scenario_definitions
+          @feature_elements = feature_elements
         end
 
         def children
-          [background] + @feature_elements
+          @feature_elements
         end
 
         def short_name
@@ -47,7 +47,6 @@ module Cucumber
           sexp += [comment] if comment
           tags = @tags.to_sexp
           sexp += tags if tags.any?
-          sexp += [@background.to_sexp] if @background
           sexp += @feature_elements.map{|fe| fe.to_sexp}
           sexp
         end
@@ -66,6 +65,24 @@ module Cucumber
         end
       end
 
+      class BackgroundFinder
+        def initialize(feature_elements)
+          @background = nil
+          feature_elements[0].describe_to(self) unless feature_elements.empty?
+        end
+
+        def background(background)
+          @background = background
+        end
+
+        def result
+          @background ? @background : EmptyBackground.new
+        end
+
+        def method_missing(*)
+        end
+      end
+
       require 'delegate'
       class LanguageDelegator < SimpleDelegator
         attr_reader :iso_code

data/lib/cucumber/core/gherkin/ast_builder.rb

@@ -13,7 +13,7 @@ module Cucumber
         end
 
         def feature(attributes)
-          FeatureBuilder.new(file, attributes).result
+          DocumentBuilder.new(file, attributes).feature
         end
 
         private
@@ -94,55 +94,68 @@ module Cucumber
           end
         end
 
+        class DocumentBuilder < Builder
+          def initialize(file, attributes)
+            @file = file
+            @attributes = rubify_keys(attributes.dup)
+          end
+
+          def feature
+            return Ast::NullFeature.new unless attributes[:feature]
+            feature_builder = FeatureBuilder.new(file, attributes[:feature])
+            feature_builder.handle_comments(all_comments)
+            feature_builder.result
+          end
+
+          def all_comments
+            attributes[:comments].map do |comment|
+              Ast::Comment.new(
+                Ast::Location.new(file, comment[:location][:line]),
+                comment[:text]
+              )
+            end
+          end
+        end
+
         class FeatureBuilder < Builder
-          attr_reader :language, :background_builder, :scenario_definition_builders
+          attr_reader :language, :feature_element_builders
 
           def initialize(*)
             super
             @language = Ast::LanguageDelegator.new(attributes[:language], ::Gherkin::Dialect.for(attributes[:language]))
-            @background_builder = BackgroundBuilder.new(file, attributes[:background]) if attributes[:background]
-            @scenario_definition_builders = attributes[:scenario_definitions].map do |sd|
-              sd[:type] == :Scenario ? ScenarioBuilder.new(file, sd) : ScenarioOutlineBuilder.new(file, sd)
+            @feature_element_builders = attributes[:children].map do |child|
+              case child[:type]
+              when :Background
+                BackgroundBuilder.new(file, child)
+              when :Scenario
+                ScenarioBuilder.new(file, child)
+              else 
+                ScenarioOutlineBuilder.new(file, child)
+              end
             end
           end
 
           def result
-            handle_comments(all_comments)
             Ast::Feature.new(
               language,
               location,
-              background,
               comments,
               tags,
               keyword,
               name,
               description,
-              scenario_definitions
+              feature_elements
             )
           end
 
           private
 
-          def background
-            return Ast::EmptyBackground.new unless background_builder
-            background_builder.result(language)
-          end
-
-          def scenario_definitions
-            scenario_definition_builders.map { |builder| builder.result(language) }
-          end
-
-          def all_comments
-            attributes[:comments].map do |comment|
-              Ast::Comment.new(
-                Ast::Location.new(file, comment[:location][:line]),
-                comment[:text]
-              )
-            end
+          def feature_elements
+            feature_element_builders.map { |builder| builder.result(language) }
           end
 
           def children
-            (background_builder ? [background_builder] : []) + scenario_definition_builders
+            feature_element_builders
           end
         end
 

data/lib/cucumber/core/gherkin/parser.rb

@@ -22,10 +22,6 @@ module Cucumber
           scanner = ::Gherkin::TokenScanner.new(document.body)
           core_builder = AstBuilder.new(document.uri)
 
-          if document.body.strip.empty?
-            return receiver.feature Ast::NullFeature.new
-          end
-
           begin
             result = parser.parse(scanner)
 

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

@@ -0,0 +1,36 @@
+module Cucumber
+  module Core
+    module Test
+      module Filters
+
+        # This filter is used for testing Cucumber itself. It adds step definitions
+        # that will activate steps to have passed / failed / pending results
+        # if they use conventional names.
+        #
+        # It was extracted from our test code, and does not have any tests of its own.
+        class ActivateStepsForSelfTest < Core::Filter.new
+          Failure = Class.new(StandardError)
+
+          def test_case(test_case)
+            test_steps = test_case.test_steps.map do |step|
+              case step.name
+              when /fail/
+                step.with_action { raise Failure }
+              when /pending/
+                step.with_action { raise Test::Result::Pending }
+              when /pass/
+                step.with_action {}
+              else
+                step
+              end
+            end
+
+            test_case.with_steps(test_steps).describe_to(receiver)
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/cucumber/core/test/result.rb

@@ -227,8 +227,12 @@ module Cucumber
             self
           end
 
-          def total
-            @totals.reduce(0) { |total, status| total += status[1] }
+          def total(for_status = nil)
+            if for_status
+              @totals.fetch(for_status) { 0 }
+            else
+              @totals.reduce(0) { |total, status| total += status[1] }
+            end
           end
 
           private

data/lib/cucumber/core/test/timer.rb

@@ -24,8 +24,26 @@ module Cucumber
         private
 
         def time_in_nanoseconds
-          t = Time.now
-          t.to_i * 10 ** 9 + t.nsec
+          MonotonicTime.time_in_nanoseconds
+        end
+
+        module MonotonicTime
+          module_function
+
+          if defined?(Process::CLOCK_MONOTONIC)
+            def time_in_nanoseconds
+              Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+            end
+          elsif (defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby') == 'jruby'
+            def time_in_nanoseconds
+              java.lang.System.nanoTime()
+            end
+          else
+            def time_in_nanoseconds
+              t = Time.now
+              t.to_i * 10 ** 9 + t.nsec
+            end
+          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.4.0"
+        "1.5.0"
       end
     end
   end

data/spec/cucumber/core/gherkin/parser_spec.rb

@@ -225,11 +225,7 @@ module Cucumber
 
         context "a Scenario Outline with no Examples" do
           source do
-            feature do
-              scenario_outline do
-                step 'passing <arg>'
-              end
-            end
+            feature(language: 'not-a-language')
           end
           it "throws an error" do
             expect { feature.describe_to(double.as_null_object) }.to raise_error(ParseError)

data/spec/cucumber/core/test/action_spec.rb

@@ -90,10 +90,7 @@ module Cucumber
 
           context "recording the duration" do
             before do
-              time = double
-              allow( Time ).to receive(:now) { time }
-              allow( time ).to receive(:nsec).and_return(946752000, 946752001)
-              allow( time ).to receive(:to_i).and_return(1377009235, 1377009235)
+              allow( Timer::MonotonicTime ).to receive(:time_in_nanoseconds).and_return(525702744080000, 525702744080001)
             end
 
             it "records the nanoseconds duration of the execution on the result" do

data/spec/cucumber/core/test/result_spec.rb

@@ -253,26 +253,30 @@ module Cucumber::Core::Test
 
       it "counts failed results" do
         failed.describe_to summary
-        expect( summary.total_failed ).to eq 1
-        expect( summary.total        ).to eq 1
+        expect( summary.total_failed   ).to eq 1
+        expect( summary.total(:failed) ).to eq 1
+        expect( summary.total          ).to eq 1
       end
 
       it "counts passed results" do
         passed.describe_to summary
-        expect( summary.total_passed ).to eq 1
-        expect( summary.total        ).to eq 1
+        expect( summary.total_passed   ).to eq 1
+        expect( summary.total(:passed) ).to eq 1
+        expect( summary.total          ).to eq 1
       end
 
       it "counts skipped results" do
         skipped.describe_to summary
-        expect( summary.total_skipped ).to eq 1
-        expect( summary.total         ).to eq 1
+        expect( summary.total_skipped   ).to eq 1
+        expect( summary.total(:skipped) ).to eq 1
+        expect( summary.total           ).to eq 1
       end
 
       it "counts undefined results" do
         undefined.describe_to summary
-        expect( summary.total_undefined ).to eq 1
-        expect( summary.total           ).to eq 1
+        expect( summary.total_undefined   ).to eq 1
+        expect( summary.total(:undefined) ).to eq 1
+        expect( summary.total             ).to eq 1
       end
 
       it "counts abitrary raisable results" do
@@ -283,13 +287,16 @@ module Cucumber::Core::Test
         end
 
         flickering.new.describe_to summary
-        expect( summary.total_flickering ).to eq 1
-        expect( summary.total           ).to eq 1
+        expect( summary.total_flickering   ).to eq 1
+        expect( summary.total(:flickering) ).to eq 1
+        expect( summary.total              ).to eq 1
       end
 
       it "returns zero for a status where no messges have been received" do
-        expect( summary.total_passed ).to eq 0
-        expect( summary.total_ponies ).to eq 0
+        expect( summary.total_passed   ).to eq 0
+        expect( summary.total(:passed) ).to eq 0
+        expect( summary.total_ponies   ).to eq 0
+        expect( summary.total(:ponies) ).to eq 0
       end
 
       it "doesn't count unknown results" do

data/spec/cucumber/core/test/runner_spec.rb

@@ -24,10 +24,7 @@ module Cucumber::Core::Test
 
     context "reporting the duration of a test case" do
       before do
-        time = double
-        allow(Time).to receive(:now).and_return(time)
-        allow(time).to receive(:nsec).and_return(946752000, 946752001)
-        allow(time).to receive(:to_i).and_return(1377009235, 1377009235)
+        allow( Timer::MonotonicTime ).to receive(:time_in_nanoseconds).and_return(525702744080000, 525702744080001)
       end
 
       context "for a passing test case" do

data/spec/cucumber/core/test/timer_spec.rb

@@ -6,10 +6,8 @@ module Cucumber
     module Test
       describe Timer do
         before do
-          time = double
-          allow( Time ).to receive(:now) { time }
-          allow( time ).to receive(:nsec).and_return(946752000, 946752001)
-          allow( time ).to receive(:to_i).and_return(1377009235, 1377009235)
+          allow(Timer::MonotonicTime).to receive(:time_in_nanoseconds)
+                                            .and_return(525702744080000, 525702744080001)
         end
 
         it "returns a Result::Duration object" do

data/spec/cucumber/core_spec.rb

@@ -5,6 +5,7 @@ require 'cucumber/core/gherkin/writer'
 require 'cucumber/core/platform'
 require 'cucumber/core/report/summary'
 require 'cucumber/core/test/around_hook'
+require 'cucumber/core/test/filters/activate_steps_for_self_test'
 
 module Cucumber
   describe Core do
@@ -200,23 +201,6 @@ module Cucumber
 
     describe "executing a test suite" do
       context "without hooks" do
-        class WithSteps < Core::Filter.new
-          def test_case(test_case)
-            test_steps = test_case.test_steps.map do |step|
-              case step.name
-              when /fail/
-                step.with_action { raise Failure }
-              when /pass/
-                step.with_action {}
-              else
-                step
-              end
-            end
-
-            test_case.with_steps(test_steps).describe_to(receiver)
-          end
-        end
-
         it "executes the test cases in the suite" do
           gherkin = gherkin do
             feature 'Feature name' do
@@ -234,7 +218,7 @@ module Cucumber
           end
           report = Core::Report::Summary.new
 
-          execute [gherkin], report, [WithSteps.new]
+          execute [gherkin], report, [Core::Test::Filters::ActivateStepsForSelfTest.new]
 
           expect( report.test_cases.total           ).to eq 2
           expect( report.test_cases.total_passed    ).to eq 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - lib/cucumber/core/test/around_hook.rb
 - lib/cucumber/core/test/case.rb
 - lib/cucumber/core/test/filters.rb
+- lib/cucumber/core/test/filters/activate_steps_for_self_test.rb
 - lib/cucumber/core/test/filters/locations_filter.rb
 - lib/cucumber/core/test/filters/name_filter.rb
 - lib/cucumber/core/test/filters/tag_filter.rb
@@ -219,7 +220,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-core-1.4.0
+summary: cucumber-core-1.5.0
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb