dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4181 from jekyll/bump-cucumber 

Merge pull request 4181
This commit is contained in:
Parker Moore 2015-11-24 17:33:15 -08:00
parent d7bac8cc40 1bde4ce84a
commit 79380e86fa
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -12,7 +12,7 @@ end
group :test do group :test do
gem 'redgreen', '~> 1.2' gem 'redgreen', '~> 1.2'
gem 'shoulda', '~> 3.5' gem 'shoulda', '~> 3.5'
gem 'cucumber', '~> 2.0', '< 2.1' gem 'cucumber', '~> 2.1'
gem 'simplecov', '~> 0.9' gem 'simplecov', '~> 0.9'
gem 'jekyll_test_plugin' gem 'jekyll_test_plugin'
gem 'jekyll_test_plugin_malicious' gem 'jekyll_test_plugin_malicious'

2
features/include_tag.feature
View File

@ -15,7 +15,7 @@ Feature: Include tags
| Ignore params if unused | 2013-03-21 | html | {% include ignore.html date="today" %} | | Ignore params if unused | 2013-03-21 | html | {% include ignore.html date="today" %} |
| List multiple parameters | 2013-03-21 | html | {% include params.html date="today" start="tomorrow" %} | | List multiple parameters | 2013-03-21 | html | {% include params.html date="today" start="tomorrow" %} |
| Dont keep parameters | 2013-03-21 | html | {% include ignore.html param="test" %}\n{% include header.html %} | | Dont keep parameters | 2013-03-21 | html | {% include ignore.html param="test" %}\n{% include header.html %} |
| Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\"quoted\"" single='has "quotes"' escaped='\'single\' quotes' %} | | Allow params with spaces and quotes | 2013-04-07 | html | {% include params.html cool="param with spaces" super="\\"quoted\\"" single='has "quotes"' escaped='\\'single\\' quotes' %} |
| Parameter syntax | 2013-04-12 | html | {% include params.html param1_or_2="value" %} | | Parameter syntax | 2013-04-12 | html | {% include params.html param1_or_2="value" %} |
| Pass a variable | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %} | | Pass a variable | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %} |
When I run jekyll build When I run jekyll build

4
features/support/overview.rb
View File

@ -2,7 +2,6 @@ require 'fileutils'
require 'colorator' require 'colorator'
require 'cucumber/formatter/console' require 'cucumber/formatter/console'
require 'cucumber/formatter/io' require 'cucumber/formatter/io'
require 'gherkin/formatter/escaping'
module Features module Features
module Support module Support
@ -17,12 +16,11 @@ module Features
include FileUtils include FileUtils
include Cucumber::Formatter::Console include Cucumber::Formatter::Console
include Cucumber::Formatter::Io include Cucumber::Formatter::Io
include Gherkin::Formatter::Escaping
attr_writer :indent attr_writer :indent
attr_reader :runtime attr_reader :runtime
def initialize(runtime, path_or_io, options) def initialize(runtime, path_or_io, options)
@runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options @runtime, @io, @options = runtime, ensure_io(path_or_io), options
@exceptions = [] @exceptions = []
@indent = 0 @indent = 0
@prefixes = options[:prefixes] || {} @prefixes = options[:prefixes] || {}