cucumber-core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e74d19b9afa811f9bb89519680da05fb54e4f21
-  data.tar.gz: 51423664d262bb30d820712a52ff8c5dcbd2b43e
+  metadata.gz: 3f3a3d2a1c3f4b18449225549d35fedcf56dde29
+  data.tar.gz: d7ea03f3906eb56001fd04625875d17a45711680
 SHA512:
-  metadata.gz: 11c262271fe0041e39e9e0c6a400ea3d5de63c702ff528edae821dfba99fa7408c26a61ae6c4093be79ec596805465fbd2d9c31a9b7bc8eef1a8b2a9cad64a58
-  data.tar.gz: ea0a43a32a8566e51cae8d90c8831ca3af9e42fd48da76d12c586754973ede208a33df577e39b0afa98afedc3ad1dbe3aebc443669540a7132af09e1ce8e2fc2
+  metadata.gz: 066615ed100d54bf46fc955adc8bc7e1b52b4e9617d82247b436baf3138f05ada07afdeb4f1f5767787cb97fc4f299ddb03a09d48129f92cc79144e88257bb98
+  data.tar.gz: 1a2e6cef1e122116f914087cb44b9e01884ea0c6de67c7c3fb045267db93fc37ff976e5c0aebf33db5540829ede1209512bfd5e341de3cd2b945d71c0a6f85ed

data/HISTORY.md

@@ -1,9 +1,14 @@
 ## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.1.1...master)
 
-* Your change here?
+### New Features
+
+  * Make Test Case names for Scenario Outlines language neutral [83](https://github.com/cucumber/cucumber-ruby-core/pull/83) (@brasmusson)
+  * Add predicate methods for Multline arguments (@mattwynne)
+  * Expose `Test::Case#feature` (@mattwynne)
+  * Fail test case if around hook fails (@mattwynne, @tooky)
+  * Expose `Test::Case#around_hooks` (@tooky)
 
-##
-[v1.1.1](https://github.com/cucumber/cucumber-ruby-core/compare/v1.1.1...v1.1.1)
+## [v1.1.1](https://github.com/cucumber/cucumber-ruby-core/compare/v1.1.0...v1.1.1)
 
 
 ### New Features

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

@@ -49,6 +49,14 @@ module Cucumber
           dup
         end
 
+        def data_table?
+          true
+        end
+
+        def doc_string?
+          false
+        end
+
         # Creates a copy of this table
         #
         def dup

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

@@ -33,6 +33,14 @@ module Cucumber
           super @content
         end
 
+        def data_table?
+          false
+        end
+
+        def doc_string?
+          true
+        end
+
         def map
           raise ArgumentError, "No block given" unless block_given?
           new_content = yield content

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

@@ -6,6 +6,14 @@ module Cucumber
           self
         end
 
+        def data_table?
+          false
+        end
+
+        def doc_string?
+          false
+        end
+
         def map(&block)
           self
         end

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

@@ -4,14 +4,26 @@ module Cucumber
       class AroundHook
         def initialize(&block)
           @block = block
+          @timer = Timer.new
         end
 
         def describe_to(visitor, *args, &continue)
           visitor.around_hook(self, *args, &continue)
         end
 
-        def call(continue)
+        def execute(*args, &continue)
+          @timer.start
           @block.call(continue)
+          Result::Unknown.new # Around hook does not know the result of the inner test steps
+        rescue Result::Raisable => exception
+          exception.with_duration(@timer.duration)
+        rescue Exception => exception
+          failed(exception)
+        end
+
+        private
+        def failed(exception)
+          Result::Failed.new(@timer.duration, exception)
         end
       end
     end

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

@@ -5,7 +5,6 @@ module Cucumber
     module Test
       class Case
         attr_reader :source, :test_steps, :around_hooks
-        private     :around_hooks
 
         def initialize(test_steps, source, around_hooks = [])
           raise ArgumentError.new("test_steps should be an Array but is a #{test_steps.class}") unless test_steps.kind_of?(Array)
@@ -82,6 +81,10 @@ module Cucumber
           "<#{self.class}: #{location}>"
         end
 
+        def feature
+          source.first
+        end
+
         private
 
         def compose_around_hooks(visitor, *args, &block)
@@ -90,10 +93,6 @@ module Cucumber
           end.call
         end
 
-        def feature
-          source.first
-        end
-
         class NameBuilder
           attr_reader :result
           attr_reader :keyword
@@ -126,7 +125,7 @@ module Cucumber
           end
 
           def examples_table_row(row)
-            @result = " (row #{row.number})"
+            @result = " (##{row.number})"
             self
           end
         end

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

@@ -27,7 +27,7 @@ module Cucumber
         end
 
         def around_hook(hook, &continue)
-          hook.call(continue)
+          running_test_case.execute(hook, &continue)
           self
         end
 
@@ -42,8 +42,8 @@ module Cucumber
             @status = Status::Unknown.new(Result::Unknown.new)
           end
 
-          def execute(test_step)
-            status.execute(test_step, self)
+          def execute(test_step, &continue)
+            status.execute(test_step, self, &continue)
           end
 
           def result
@@ -95,8 +95,8 @@ module Cucumber
                 @step_result = step_result
               end
 
-              def execute(test_step, monitor)
-                result = test_step.execute(monitor.result)
+              def execute(test_step, monitor, &continue)
+                result = test_step.execute(monitor.result, &continue)
                 result.describe_to(monitor, result)
               end
 
@@ -118,7 +118,7 @@ module Cucumber
             end
 
             class Failing < Base
-              def execute(test_step, monitor)
+              def execute(test_step, monitor, &continue)
                 test_step.skip(monitor.result)
               end
 

data/lib/cucumber/core/version.rb

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

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

@@ -28,6 +28,22 @@ module Cucumber
           end
         end
 
+        describe "#data_table?" do
+          let(:table) { DataTable.new([[1,2],[3,4]], location) }
+
+          it "returns true" do
+            expect(table).to be_data_table
+          end
+        end
+
+        describe "#doc_string" do
+          let(:table) { DataTable.new([[1,2],[3,4]], location) }
+
+          it "returns false" do
+            expect(table).not_to be_doc_string
+          end
+        end
+
         describe "#map" do
           let(:table) { DataTable.new([ %w{foo bar}, %w{1 2} ], location) }
 

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

@@ -8,6 +8,22 @@ module Cucumber
         let(:location) { double }
         let(:doc_string) { DocString.new(content, content_type, location) }
 
+        describe "#data_table?" do
+          let(:doc_string) { DocString.new("test", "text/plain" , location) }
+
+          it "returns false" do
+            expect(doc_string).not_to be_data_table
+          end
+        end
+
+        describe "#doc_string" do
+          let(:doc_string) { DocString.new("test", "text/plain" , location) }
+
+          it "returns true" do
+            expect(doc_string).to be_doc_string
+          end
+        end
+
         context '#map' do
           let(:content) { 'original content' }
           let(:content_type) { double }

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

@@ -0,0 +1,27 @@
+require 'cucumber/core/ast/location'
+require 'cucumber/core/ast/empty_multiline_argument'
+
+module Cucumber
+  module Core
+    module Ast
+      describe EmptyMultilineArgument do
+
+        let(:location) { double }
+        let(:arg) { EmptyMultilineArgument.new }
+
+        describe "#data_table?" do
+          it "returns false" do
+            expect(arg).not_to be_data_table
+          end
+        end
+
+        describe "#doc_string" do
+          it "returns false" do
+            expect(arg).not_to be_doc_string
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -97,14 +97,14 @@ module Cucumber
               end
               receiver = double.as_null_object
               expect( receiver ).to receive(:test_case) do |test_case|
-                expect( test_case.name ).to eq 'outline name, examples name (row 1)'
+                expect( test_case.name ).to eq 'outline name, examples name (#1)'
                 expect( test_case.keyword ).to eq 'Scenario Outline'
               end.once.ordered
               expect( receiver ).to receive(:test_case) do |test_case|
-                expect( test_case.name ).to eq 'outline name, examples name (row 2)'
+                expect( test_case.name ).to eq 'outline name, examples name (#2)'
               end.once.ordered
               expect( receiver ).to receive(:test_case) do |test_case|
-                expect( test_case.name ).to eq 'outline name, Examples (row 1)'
+                expect( test_case.name ).to eq 'outline name, Examples (#1)'
               end.once.ordered
               compile [gherkin], receiver
             end
@@ -378,7 +378,7 @@ module Cucumber
             end
 
             let(:test_case) do
-              test_cases.find { |c| c.name == "two, x1 (row 1)" }
+              test_cases.find { |c| c.name == "two, x1 (#1)" }
             end
 
             it 'matches the precise location of the scenario outline examples table row' do

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

@@ -7,7 +7,7 @@ module Cucumber::Core::Test
   describe Runner do
 
     let(:test_case) { Case.new(test_steps, source) }
-    let(:source)    { double }
+    let(:source)    { [double('ast node', location: double)] }
     let(:runner)    { Runner.new(report) }
     let(:report)    { double.as_null_object }
     let(:passing)   { Step.new([double]).with_action {} }
@@ -210,5 +210,51 @@ module Cucumber::Core::Test
       end
     end
 
+    require 'cucumber/core/test/around_hook'
+    context "with around hooks" do
+      it "passes normally when around hooks don't fail" do
+        around_hook = AroundHook.new { |block| block.call }
+        passing_step = Step.new([double]).with_action {}
+        test_case = Case.new([passing_step], source, [around_hook])
+        expect(report).to receive(:after_test_case).with(test_case, anything) do |reported_test_case, result|
+          expect(result).to be_passed
+        end
+        test_case.describe_to runner
+      end
+
+      it "gets a failed result if the Around hook fails before the test case is run" do
+        around_hook = AroundHook.new { |block| raise exception }
+        passing_step = Step.new([double]).with_action {}
+        test_case = Case.new([passing_step], source, [around_hook])
+        expect(report).to receive(:after_test_case).with(test_case, anything) do |reported_test_case, result|
+          expect(result).to be_failed
+          expect(result.exception).to eq exception
+        end
+        test_case.describe_to runner
+      end
+
+      it "gets a failed result if the Around hook fails after the test case is run" do
+        around_hook = AroundHook.new { |block| block.call; raise exception }
+        passing_step = Step.new([double]).with_action {}
+        test_case = Case.new([passing_step], source, [around_hook])
+        expect(report).to receive(:after_test_case).with(test_case, anything) do |reported_test_case, result|
+          expect(result).to be_failed
+          expect(result.exception).to eq exception
+        end
+        test_case.describe_to runner
+      end
+
+      it "fails when a step fails if the around hook works" do
+        around_hook = AroundHook.new { |block| block.call }
+        failing_step = Step.new([double]).with_action { raise exception }
+        test_case = Case.new([failing_step], source, [around_hook])
+        expect(report).to receive(:after_test_case).with(test_case, anything) do |reported_test_case, result|
+          expect(result).to be_failed
+          expect(result.exception).to eq exception
+        end
+        test_case.describe_to runner
+      end
+    end
+
   end
 end

data/spec/cucumber/core_spec.rb

@@ -48,7 +48,7 @@ module Cucumber
       it "filters out test cases based on a tag expression" do
         visitor = double.as_null_object
         expect( visitor ).to receive(:test_case) do |test_case|
-          expect( test_case.name ).to eq 'foo, bar (row 1)'
+          expect( test_case.name ).to eq 'foo, bar (#1)'
         end.exactly(1).times
 
         gherkin = gherkin do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -173,6 +173,7 @@ files:
 - spec/coverage.rb
 - spec/cucumber/core/ast/data_table_spec.rb
 - spec/cucumber/core/ast/doc_string_spec.rb
+- spec/cucumber/core/ast/empty_multiline_argument_spec.rb
 - spec/cucumber/core/ast/examples_table_spec.rb
 - spec/cucumber/core/ast/location_spec.rb
 - spec/cucumber/core/ast/outline_step_spec.rb
@@ -216,12 +217,13 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-core-1.1.1
+summary: cucumber-core-1.1.2
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
 - spec/cucumber/core/ast/data_table_spec.rb
 - spec/cucumber/core/ast/doc_string_spec.rb
+- spec/cucumber/core/ast/empty_multiline_argument_spec.rb
 - spec/cucumber/core/ast/examples_table_spec.rb
 - spec/cucumber/core/ast/location_spec.rb
 - spec/cucumber/core/ast/outline_step_spec.rb