cucumber-core 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5c7dce2de4429c75212c41a7d68768df625b22e
-  data.tar.gz: a1b973e289c386411ec84f27cc83db1b2ad4e147
+  metadata.gz: 5e74d19b9afa811f9bb89519680da05fb54e4f21
+  data.tar.gz: 51423664d262bb30d820712a52ff8c5dcbd2b43e
 SHA512:
-  metadata.gz: 20196a25adcfb5fe2bba86beb60ac8d1e8472e89b280add560da96737cb2e1bdb8b0c6a60e9438dc981a74669629dbb0f9336c34fcb502a8b55b5cffdfa92e0c
-  data.tar.gz: d01388ba71e8e2e09f7286d1425406db8f0d72b44805d49261eec7b6e0be2b934c10e6cc465f04a81893c2688f2293d7774bc9c330d1dcba26c9a174c79f132f
+  metadata.gz: 11c262271fe0041e39e9e0c6a400ea3d5de63c702ff528edae821dfba99fa7408c26a61ae6c4093be79ec596805465fbd2d9c31a9b7bc8eef1a8b2a9cad64a58
+  data.tar.gz: ea0a43a32a8566e51cae8d90c8831ca3af9e42fd48da76d12c586754973ede208a33df577e39b0afa98afedc3ad1dbe3aebc443669540a7132af09e1ce8e2fc2

data/HISTORY.md

@@ -1,8 +1,22 @@
-## [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.1.1...master)
 
-## [In Git](https://github.com/cucumber/cucumber-ruby-core/compare/v1.0.0...v1.1.0)
+* Your change here?
 
-### New features
+##
+[v1.1.1](https://github.com/cucumber/cucumber-ruby-core/compare/v1.1.1...v1.1.1)
+
+
+### New Features
+
+  * Calculate actual keyword for snippets (@brasmusson)
+
+### Bugfixes
+
+  * Remove keyword from `Test::Case#name` [82](https://github.com/cucumber/cucumber-ruby-core/pull/82) (@richarda)
+
+## [v1.1.0](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)
 

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

@@ -11,7 +11,7 @@ module Cucumber
         attr_reader :keyword, :name, :language, :exception, :multiline_arg, :gherkin_statement
 
         def initialize(gherkin_statement, language, location, keyword, name, multiline_arg)
-          @gherkin_statement, @location, @keyword, @name, @multiline_arg = gherkin_statement, location, keyword, name, multiline_arg
+          @gherkin_statement, @language, @location, @keyword, @name, @multiline_arg = gherkin_statement, language, location, keyword, name, multiline_arg
         end
 
         def to_sexp
@@ -22,6 +22,18 @@ module Cucumber
           "#{location}:in `#{keyword}#{name}'"
         end
 
+        def actual_keyword(previous_step_keyword = nil)
+          if [language.keywords('and'), language.keywords('but')].flatten.uniq.include? keyword
+            if previous_step_keyword.nil?
+              language.keywords('given').reject{|kw| kw == '* '}[0]
+            else
+              previous_step_keyword
+            end
+          else
+            keyword
+          end
+        end
+
         private
 
         def children
@@ -36,7 +48,7 @@ module Cucumber
       class ExpandedOutlineStep < Step
 
         def initialize(outline_step, gherkin_statement, language, location, keyword, name, multiline_arg)
-          @outline_step, @gherkin_statement, @location, @keyword, @name, @multiline_arg = outline_step, gherkin_statement, location, keyword, name, multiline_arg
+          @outline_step, @gherkin_statement, @language, @location, @keyword, @name, @multiline_arg = outline_step, gherkin_statement, language, location, keyword, name, multiline_arg
         end
 
         alias :self_match_locations? :match_locations?

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

@@ -47,6 +47,10 @@ module Cucumber
         def name
           @name ||= NameBuilder.new(self).result
         end
+        
+        def keyword
+          @keyword ||= NameBuilder.new(self).keyword
+        end
 
         def tags
           @tags ||= TagCollector.new(self).result
@@ -92,6 +96,7 @@ module Cucumber
 
         class NameBuilder
           attr_reader :result
+          attr_reader :keyword
 
           def initialize(test_case)
             test_case.describe_source_to self
@@ -102,12 +107,14 @@ module Cucumber
           end
 
           def scenario(scenario)
-            @result = "#{scenario.keyword}: #{scenario.name}"
+            @result = scenario.name
+            @keyword = scenario.keyword
             self
           end
 
           def scenario_outline(outline)
-            @result = "#{outline.keyword}: #{outline.name}" + @result
+            @result = outline.name + @result
+            @keyword = outline.keyword
             self
           end
 

data/lib/cucumber/core/version.rb

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

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

@@ -1,4 +1,5 @@
 require 'cucumber/core/ast/step'
+require 'gherkin/i18n'
 
 module Cucumber
   module Core
@@ -47,6 +48,53 @@ module Cucumber
 
         end
 
+        describe "actual keyword" do
+          let(:language) { ::Gherkin::I18n.get('en') }
+
+          context "for keywords 'given', 'when' and 'then'" do
+            let(:given_step) { Step.new(double, language, double, "Given ", double, double) }
+            let(:when_step) { Step.new(double, language, double, "When ", double, double) }
+            let(:then_step) { Step.new(double, language, double, "Then ", double, double) }
+
+            it "returns the keyword itself" do
+              expect( given_step.actual_keyword(nil) ).to eq("Given ")
+              expect( when_step.actual_keyword(nil) ).to eq("When ")
+              expect( then_step.actual_keyword(nil) ).to eq("Then ")
+            end
+          end
+
+          context "for keyword 'and', 'but', and '*'" do
+            let(:and_step) { Step.new(double, language, double, "And ", double, double) }
+            let(:but_step) { Step.new(double, language, double, "But ", double, double) }
+            let(:asterisk_step) { Step.new(double, language, double, "* ", double, double) }
+
+            context "when the previous step keyword exist" do
+              it "returns the previous step keyword" do
+                expect( and_step.actual_keyword("Then ") ).to eq("Then ")
+                expect( but_step.actual_keyword("Then ") ).to eq("Then ")
+                expect( asterisk_step.actual_keyword("Then ") ).to eq("Then ")
+              end
+            end
+
+            context "when the previous step keyword does not exist" do
+              it "returns the 'given' keyword" do
+                expect( and_step.actual_keyword(nil) ).to eq("Given ")
+                expect( but_step.actual_keyword(nil) ).to eq("Given ")
+                expect( asterisk_step.actual_keyword(nil) ).to eq("Given ")
+              end
+            end
+
+          end
+
+          context "for i18n languages" do
+            let(:language) { ::Gherkin::I18n.get('en-lol') }
+            let(:and_step) { Step.new(double, language, double, "AN ", double, double) }
+
+            it "returns the keyword in the correct language" do
+              expect( and_step.actual_keyword(nil) ).to eq("I CAN HAZ ")
+            end
+          end
+        end
       end
 
       describe ExpandedOutlineStep do

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

@@ -68,7 +68,8 @@ module Cucumber
               receiver = double.as_null_object
 
               expect( receiver ).to receive(:test_case) do |test_case|
-                expect( test_case.name ).to eq 'Scenario: Scenario name'
+                expect( test_case.name ).to eq 'Scenario name'
+                expect( test_case.keyword ).to eq 'Scenario'
               end
               compile([gherkin], receiver)
             end
@@ -96,13 +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 'Scenario Outline: outline name, examples name (row 1)'
+                expect( test_case.name ).to eq 'outline name, examples name (row 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 'Scenario Outline: outline name, examples name (row 2)'
+                expect( test_case.name ).to eq 'outline name, examples name (row 2)'
               end.once.ordered
               expect( receiver ).to receive(:test_case) do |test_case|
-                expect( test_case.name ).to eq 'Scenario Outline: outline name, Examples (row 1)'
+                expect( test_case.name ).to eq 'outline name, Examples (row 1)'
               end.once.ordered
               compile [gherkin], receiver
             end
@@ -273,7 +275,7 @@ module Cucumber
             end
 
             let(:test_case) do
-              test_cases.find { |c| c.name == 'Scenario: two' }
+              test_cases.find { |c| c.name == 'two' }
             end
 
             it 'matches the precise location of the scenario' do
@@ -282,7 +284,7 @@ module Cucumber
             end
 
             it 'matches the precise location of an empty scenario' do
-              empty_scenario_test_case = test_cases.find { |c| c.name == 'Scenario: empty' }
+              empty_scenario_test_case = test_cases.find { |c| c.name == 'empty' }
               location = Ast::Location.new(file, 26)
               expect( empty_scenario_test_case.match_locations?([location]) ).to be_truthy
             end
@@ -320,7 +322,7 @@ module Cucumber
 
             context "with a docstring" do
               let(:test_case) do
-                test_cases.find { |c| c.name == 'Scenario: with docstring' }
+                test_cases.find { |c| c.name == 'with docstring' }
               end
 
               it "matches a location at the start the docstring" do
@@ -336,7 +338,7 @@ module Cucumber
 
             context "with a table" do
               let(:test_case) do
-                test_cases.find { |c| c.name == 'Scenario: with a table' }
+                test_cases.find { |c| c.name == 'with a table' }
               end
 
               it "matches a location on the first table row" do
@@ -349,7 +351,7 @@ module Cucumber
           context "for a scenario outline" do
             let(:source) do
               Gherkin::Document.new(file, <<-END.unindent)
-                Feature: 
+                Feature:
 
                   Scenario: one
                     Given one a
@@ -376,7 +378,7 @@ module Cucumber
             end
 
             let(:test_case) do
-              test_cases.find { |c| c.name == "Scenario Outline: two, x1 (row 1)" }
+              test_cases.find { |c| c.name == "two, x1 (row 1)" }
             end
 
             it 'matches the precise location of the scenario outline examples table row' do

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 'Scenario Outline: foo, bar (row 1)'
+          expect( test_case.name ).to eq 'foo, bar (row 1)'
         end.exactly(1).times
 
         gherkin = gherkin do
@@ -283,10 +283,10 @@ module Cucumber
           expect( report.test_cases.total_passed ).to eq 1
           expect( report.test_cases.total_failed ).to eq 0
           expect( logger ).to eq [
-            :before_all, 
-              :step, 
-            :middle, 
-              :step, 
+            :before_all,
+              :step,
+            :middle,
+              :step,
             :after_all
           ]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -213,10 +213,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-core-1.1.0
+summary: cucumber-core-1.1.1
 test_files:
 - spec/capture_warnings.rb
 - spec/coverage.rb
@@ -241,4 +241,3 @@ test_files:
 - spec/cucumber/core_spec.rb
 - spec/readme_spec.rb
 - spec/report_api_spy.rb
-has_rdoc: