From 8a0941808329efac9cdc9b031c76aa5b25606de4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 16:27:16 -0800 Subject: [PATCH 1/2] Allow use of Cucumber 2.1 or greater --- Gemfile | 2 +- features/support/overview.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 68b1a636..4f3da61c 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end group :test do gem 'redgreen', '~> 1.2' gem 'shoulda', '~> 3.5' - gem 'cucumber', '~> 2.0', '< 2.1' + gem 'cucumber', '~> 2.1' gem 'simplecov', '~> 0.9' gem 'jekyll_test_plugin' gem 'jekyll_test_plugin_malicious' diff --git a/features/support/overview.rb b/features/support/overview.rb index 8d414be7..9550969b 100644 --- a/features/support/overview.rb +++ b/features/support/overview.rb @@ -2,7 +2,6 @@ require 'fileutils' require 'colorator' require 'cucumber/formatter/console' require 'cucumber/formatter/io' -require 'gherkin/formatter/escaping' module Features module Support @@ -17,12 +16,11 @@ module Features include FileUtils include Cucumber::Formatter::Console include Cucumber::Formatter::Io - include Gherkin::Formatter::Escaping attr_writer :indent attr_reader :runtime 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 = [] @indent = 0 @prefixes = options[:prefixes] || {} From 1bde4ce84a373e86770d26388f02512c991bc2c4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 24 Nov 2015 17:11:47 -0800 Subject: [PATCH 2/2] include_tag.feature: double escape --- features/include_tag.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/include_tag.feature b/features/include_tag.feature index 427c1bb4..cab01187 100644 --- a/features/include_tag.feature +++ b/features/include_tag.feature @@ -15,7 +15,7 @@ Feature: Include tags | 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" %} | | 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" %} | | Pass a variable | 2013-06-22 | html | {% assign var = 'some text' %}{% include params.html local=var title=page.title %} | When I run jekyll build