Skip to content

Commit

Permalink
Bump up to gherkin 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
norekinc committed Nov 18, 2016
1 parent 8d84b03 commit 8c0cb00
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem 'redcarpet'
gem 'gherkin', '~> 3'
gem 'gherkin', '~> 4.0'

gemspec
gemspec
33 changes: 19 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,37 +1,42 @@
PATH
remote: .
specs:
yard-cucumber (2.3.2)
cucumber (>= 1.3.0)
gherkin (~> 2.12)
yard (>= 0.8.1)
yard-cucumber (3.0.0)
cucumber (~> 2)
gherkin (~> 4.0)
yard (~> 0.8, >= 0.8.1)

GEM
remote: https://rubygems.org/
specs:
builder (3.2.2)
cucumber (2.0.2)
cucumber (2.4.0)
builder (>= 2.1.2)
cucumber-core (~> 1.2.0)
cucumber-core (~> 1.5.0)
cucumber-wire (~> 0.0.1)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
gherkin (~> 4.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (1.2.0)
gherkin (~> 2.12.0)
cucumber-core (1.5.0)
gherkin (~> 4.0)
cucumber-wire (0.0.1)
diff-lcs (1.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
multi_json (1.11.2)
gherkin (4.0.0)
multi_json (1.12.1)
multi_test (0.1.2)
rake (10.4.2)
redcarpet (2.2.2)
yard (0.8.7.6)
yard (0.9.5)

PLATFORMS
ruby

DEPENDENCIES
rake
gherkin (~> 4.0)
rake (~> 10)
redcarpet
yard-cucumber!

BUNDLED WITH
1.12.4
9 changes: 5 additions & 4 deletions lib/cucumber/city_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ def find_or_create_tag(tag_name,parent)
# This is once, as the gherking parser does not like multiple feature per
# file.
#
def feature(feature)
def feature(document)
#log.debug "FEATURE"

feature = document[:feature]
return if has_exclude_tags?(feature[:tags].map { |t| t[:name].gsub(/^@/, '') })

@feature = YARD::CodeObjects::Cucumber::Feature.new(@namespace,File.basename(@file.gsub('.feature','').gsub('.','_'))) do |f|
Expand All @@ -102,9 +102,10 @@ def feature(feature)

feature[:tags].each {|feature_tag| find_or_create_tag(feature_tag[:name],f) }
end
background(feature[:background]) if feature[:background]
feature[:scenarioDefinitions].each { |s|
feature[:children].each { |s|
case s[:type]
when :Background
background(s)
when :ScenarioOutline
scenario_outline(s)
when :Scenario
Expand Down
2 changes: 1 addition & 1 deletion yard-cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Gem::Specification.new do |s|

s.add_development_dependency 'rake', '~> 10'

s.add_dependency 'gherkin', '~> 3'
s.add_dependency 'gherkin', '~> 4.0'
s.add_dependency 'cucumber', '~> 2'
s.add_dependency 'yard', '~> 0.8', '>= 0.8.1'

Expand Down

0 comments on commit 8c0cb00

Please sign in to comment.