gli 2.5.6 → 2.6.0.rc1

data/test/apps/todo_legacy/todo.rdoc

@@ -0,0 +1,5 @@
+= todo
+
+Generate this with
+    todo rdoc
+After you have described your command line interface

data/test/tc_command.rb

@@ -10,54 +10,8 @@ class TC_testCommand < Clean::Test::TestCase
     $stdout = @fake_stdout
     @original_stderr = $stderr
     $stderr = @fake_stderr
-    @app = CLIApp.new
-    @app.error_device=@fake_stderr
     ENV.delete('GLI_DEBUG')
-    @app.reset
-    @app.program_desc 'A super awesome program'
-    @app.desc 'Some Global Option'
-    @app.switch :g
-    @app.switch :blah
-    @app.long_desc 'This is a very long description for a flag'
-    @app.flag [:y,:yes]
-    @pre_called = false
-    @post_called = false
-    @error_called = false
-    @app.pre { |g,c,o,a| @pre_called = true }
-    @app.post { |g,c,o,a| @post_called = true }
-    @app.on_error { |g,c,o,a| @error_called = true }
-    @glob = nil
-    @verbose = nil
-    @glob_verbose = nil
-    @configure = nil
-    @args = nil
-    @app.desc 'Some Basic Command that potentially has a really really really really really really really long description and stuff, but you know, who cares?'
-    @app.long_desc 'This is the long description: "Some Basic Command that potentially has a really really really really really really really long description and stuff, but you know, who cares?"'
-    @app.arg_name 'first_file second_file'
-    @app.command [:basic,:bs] do |c|
-      c.desc 'be verbose'
-      c.switch :v
-      c.desc 'configure something or other, in some way that requires a lot of verbose text and whatnot'
-      c.default_value 'crud'
-      c.flag [:c,:configure]
-      c.action do |global_options,options,arguments|
-        @glob = global_options[:g] ? 'true' : 'false'
-        @verbose = options[:v] ? 'true' : 'false'
-        @glob_verbose = global_options[:v] ? 'true' : 'false'
-        @configure = options[:c]
-        @args = arguments
-      end
-    end
-    @app.desc "Testing long help wrapping"
-    @app.long_desc <<-EOS
-    This will create a scaffold command line project that uses @app
-    for command line processing.  Specifically, this will create
-    an executable ready to go, as well as a lib and test directory, all
-    inside the directory named for your project
-    EOS
-    @app.command [:test_wrap] do |c|
-      c.action {}
-    end
+    create_app
   end
 
   def teardown
@@ -85,18 +39,25 @@ class TC_testCommand < Clean::Test::TestCase
   end
 
   def test_basic_command
-    args_args = [%w(-g basic -v -c foo bar baz quux), %w(-g basic -v --configure=foo bar baz quux)]
-    args_args.each do |args|
-      args_orig = args.clone
-      @app.run(args)
-      assert_equal('true',@glob,"For args #{args_orig}")
-      assert_equal('true',@verbose,"For args #{args_orig}")
-      assert_equal('false',@glob_verbose,"For args #{args_orig}")
-      assert_equal('foo',@configure,"For args #{args_orig}")
-      assert_equal(%w(bar baz quux),@args,"For args #{args_orig}")
-      assert(@pre_called,"Pre block should have been called for args #{args_orig}")
-      assert(@post_called,"Post block should have been called for args #{args_orig}")
-      assert(!@error_called,"Error block should not have been called for args #{args_orig}")
+    [false,true].each do |openstruct|
+    end
+    [true].each do |openstruct|
+      create_app(openstruct)
+      openstruct_message = openstruct ? ", with use_openstruct" : ""
+      args_args = [%w(-g basic -v -c foo bar baz quux), %w(-g basic -v --configure=foo bar baz quux)]
+      args_args.each do |args|
+        args_orig = args.clone
+        @app.run(args)
+        assert_equal('true',@glob,"For args #{args_orig}#{openstruct_message}")
+        assert_equal('true',@glob_long_form,"For args #{args_orig}#{openstruct_message}")
+        assert_equal('true',@verbose,"For args #{args_orig}#{openstruct_message}")
+        assert_equal('false',@glob_verbose,"For args #{args_orig}#{openstruct_message}")
+        assert_equal('foo',@configure,"For args #{args_orig}#{openstruct_message}")
+        assert_equal(%w(bar baz quux),@args,"For args #{args_orig}#{openstruct_message}")
+        assert(@pre_called,"Pre block should have been called for args #{args_orig}#{openstruct_message}")
+        assert(@post_called,"Post block should have been called for args #{args_orig}#{openstruct_message}")
+        assert(!@error_called,"Error block should not have been called for args #{args_orig}#{openstruct_message}")
+      end
     end
   end
 
@@ -402,4 +363,68 @@ class TC_testCommand < Clean::Test::TestCase
       "Didn't expected output to contain #{regexp.inspect}, output was:\n#{output}"
   end
 
+  def create_app(use_openstruct=false)
+    @app = CLIApp.new
+    @app.error_device=@fake_stderr
+    @app.reset
+    
+    if use_openstruct
+      @app.use_openstruct true
+    end
+
+    @app.program_desc 'A super awesome program'
+    @app.desc 'Some Global Option'
+    @app.switch [:g,:global]
+    @app.switch :blah
+    @app.long_desc 'This is a very long description for a flag'
+    @app.flag [:y,:yes]
+    @pre_called = false
+    @post_called = false
+    @error_called = false
+    @app.pre { |g,c,o,a| @pre_called = true }
+    @app.post { |g,c,o,a| @post_called = true }
+    @app.on_error { |g,c,o,a| @error_called = true }
+    @glob = nil
+    @verbose = nil
+    @glob_verbose = nil
+    @configure = nil
+    @args = nil
+    @app.desc 'Some Basic Command that potentially has a really really really really really really really long description and stuff, but you know, who cares?'
+    @app.long_desc 'This is the long description: "Some Basic Command that potentially has a really really really really really really really long description and stuff, but you know, who cares?"'
+    @app.arg_name 'first_file second_file'
+    @app.command [:basic,:bs] do |c|
+      c.desc 'be verbose'
+      c.switch :v
+      c.desc 'configure something or other, in some way that requires a lot of verbose text and whatnot'
+      c.default_value 'crud'
+      c.flag [:c,:configure]
+      c.action do |global_options,options,arguments|
+        if use_openstruct
+          @glob           = global_options.g      ? 'true' : 'false'
+          @glob_long_form = global_options.global ? 'true' : 'false'
+          @verbose        = options.v             ? 'true' : 'false'
+          @glob_verbose   = global_options.v      ? 'true' : 'false'
+          @configure      = options.c
+        else
+          @glob           = global_options[:g]      ? 'true' : 'false'
+          @glob_long_form = global_options[:global] ? 'true' : 'false'
+          @verbose        = options[:v]             ? 'true' : 'false'
+          @glob_verbose   = global_options[:v]      ? 'true' : 'false'
+          @configure      = options[:c]
+        end
+        @args = arguments
+      end
+    end
+    @app.desc "Testing long help wrapping"
+    @app.long_desc <<-EOS
+    This will create a scaffold command line project that uses @app
+    for command line processing.  Specifically, this will create
+    an executable ready to go, as well as a lib and test directory, all
+    inside the directory named for your project
+    EOS
+    @app.command [:test_wrap] do |c|
+      c.action {}
+    end
+  end
+
 end

data/test/tc_flag.rb

@@ -57,7 +57,6 @@ class TC_testFlag < Clean::Test::TestCase
       assert_equal(expected[:safe_default_value],@flag.safe_default_value)
       assert_equal(expected[:must_match],@flag.must_match)
       assert_equal(expected[:type],@flag.type)
-      assert(@flag.usage != nil)
     }
   end
 end

data/test/tc_gli.rb

@@ -23,6 +23,7 @@ class TC_testGLI < Clean::Test::TestCase
     @original_stderr = $stderr
     $stderr = @fake_stderr
     @app = CLIApp.new
+
     @config_file = File.expand_path(File.dirname(File.realpath(__FILE__)) + '/new_config.yaml')
     @gli_debug = ENV['GLI_DEBUG']
     @app.error_device=@fake_stderr
@@ -480,6 +481,7 @@ class TC_testGLI < Clean::Test::TestCase
   end
 
   def test_exits_zero_on_success
+    @app.reset
     assert_equal 0,@app.run([]),@fake_stderr.to_s
   end
 
@@ -649,8 +651,6 @@ class TC_testGLI < Clean::Test::TestCase
     assert (object.flags[:f] )
     assert_equal(description,object.flags[:f].description)
     assert_equal(long_desc,object.flags[:f].long_description)
-    assert(nil != object.flags[:f].usage)
-    assert(object.usage != nil) if object.respond_to? :usage
   end
 
   def do_test_switch_create(object)

data/test/tc_help.rb

@@ -26,7 +26,9 @@ class TC_testHelp < Clean::Test::TestCase
 
   test_that "the help command is configured properly when created" do
     Given {
-      @command = GLI::Commands::Help.new(TestApp.new,@output,@error)
+      app = TestApp.new
+      app.subcommand_option_handling :normal
+      @command = GLI::Commands::Help.new(app,@output,@error)
     }
     Then {
       assert_equal   'help',@command.name.to_s
@@ -42,7 +44,9 @@ class TC_testHelp < Clean::Test::TestCase
 
   test_that "the help command can be configured to skip things declaratively" do
     Given {
-      @command = GLI::Commands::Help.new(TestApp.new,@output,@error)
+      app = TestApp.new
+      app.subcommand_option_handling :normal
+      @command = GLI::Commands::Help.new(app,@output,@error)
       GLI::Commands::Help.skips_pre    = false
       GLI::Commands::Help.skips_post   = false
       GLI::Commands::Help.skips_around = false
@@ -59,7 +63,9 @@ class TC_testHelp < Clean::Test::TestCase
       GLI::Commands::Help.skips_pre    = false
       GLI::Commands::Help.skips_post   = false
       GLI::Commands::Help.skips_around = false
-      @command = GLI::Commands::Help.new(TestApp.new,@output,@error)
+      app = TestApp.new
+      app.subcommand_option_handling :normal
+      @command = GLI::Commands::Help.new(app,@output,@error)
     }
     Then {
       assert !@command.skips_pre
@@ -155,6 +161,7 @@ class TC_testHelp < Clean::Test::TestCase
     Given {
       app = TestApp.new
       app.instance_eval do
+        subcommand_option_handling :normal
         command :top do |top|
           top.command :list do |list|
             list.action do |g,o,a|
@@ -201,6 +208,7 @@ private
       @app = TestApp.new
       @app.instance_eval do
         program_desc program_description
+        subcommand_option_handling :normal
 
         unless omit_options
           flags.each do |(description,arg,flag_names)|

data/test/tc_subcommand_parsing.rb

@@ -0,0 +1,104 @@
+require 'test_helper'
+require 'pp'
+
+class TC_testSubCommandParsing < Clean::Test::TestCase
+  include TestHelper
+
+  test_that "commands options may clash with globals and it gets sorted out" do
+    Given :app_with_subcommands_storing_results
+    When {
+      @app.run(%w(-f global command1 -f command -s foo))
+    }
+    Then {
+      assert_equal  'command1',@results[:command_name]
+      assert_equal  'global',  @results[:global_options][:f],'global'
+      assert       !@results[:global_options][:s]
+      assert_equal  'command', @results[:command_options][:f]
+      assert        @results[:command_options][:s]
+    }
+  end
+
+  test_that "in legacy mode, subcommand options all share a namespace" do
+    Given :app_with_subcommands_storing_results
+    When {
+      @app.run(%w(-f global command1 -f command -s subcommand10 -f sub))
+    }
+    Then {
+      with_clue(@results) {
+        assert_equal  'subcommand10',@results[:command_name]
+        assert_equal  'global',      @results[:global_options][:f],'global'
+        assert       !@results[:global_options][:s]
+        assert_equal  'sub', @results[:command_options][:f]
+        assert        @results[:command_options][:s]
+        assert_nil    @results[:command_options][GLI::Command::PARENT]
+        assert_nil    @results[:command_options][GLI::Command::PARENT]
+      }
+    }
+  end
+
+  test_that "in normal mode, each subcommand has its own namespace" do
+    Given :app_with_subcommands_storing_results, :normal
+    When {
+      @app.run(%w(-f global command1 -f command -s subcommand10 -f sub))
+    }
+    Then {
+      with_clue(@results) {
+        assert_equal  'subcommand10',@results[:command_name]
+        assert_equal  'global',      @results[:global_options][:f],'global'
+        assert       !@results[:global_options][:s]
+        assert_equal  'sub', @results[:command_options][:f]
+        assert       !@results[:command_options][:s]
+        assert_equal  'command',@results[:command_options][GLI::Command::PARENT][:f]
+        assert        @results[:command_options][GLI::Command::PARENT][:s]
+      }
+    }
+  end
+
+private
+  def with_clue(message,&block)
+    block.call
+  rescue Exception
+    PP.pp message,dump=""
+    puts dump
+    raise
+  end
+
+  def app_with_subcommands_storing_results(subcommand_option_handling_strategy = :legacy)
+    @results = {}
+    @app = CLIApp.new
+    @app.subcommand_option_handling subcommand_option_handling_strategy
+    @app.flag ['f','flag']
+    @app.switch ['s','switch']
+
+    2.times do |i|
+      @app.command "command#{i}" do |c|
+        c.flag ['f','flag']
+        c.switch ['s','switch']
+        c.action do |global,options,args|
+          @results = {
+            :command_name => "command#{i}",
+            :global_options => global,
+            :command_options => options,
+            :args => args
+          }
+        end
+
+        2.times do |j|
+          c.command "subcommand#{i}#{j}" do |subcommand|
+            subcommand.flag ['f','flag']
+            subcommand.flag ['foo']
+            subcommand.switch ['s','switch']
+            subcommand.action do |global,options,args|
+              @results = {
+                :command_name => "subcommand#{i}#{j}",
+                :global_options => global,
+                :command_options => options,
+                :args => args
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/tc_subcommands.rb

@@ -14,6 +14,7 @@ class TC_testSubCommand < Clean::Test::TestCase
 
     @app = CLIApp.new
     @app.reset
+    @app.subcommand_option_handling :legacy
     @app.error_device=@fake_stderr
     ENV.delete('GLI_DEBUG')
   end

data/test/tc_switch.rb

@@ -49,7 +49,6 @@ class TC_testSwitch < Clean::Test::TestCase
     lambda {
       assert_equal(@options[:desc],@switch.description)
       assert_equal(@options[:long_desc],@switch.long_description)
-      assert(@switch.usage != nil)
     }
   end
 

data/test/test_helper.rb

@@ -9,6 +9,11 @@ module TestHelper
   include OptionTestHelper
   class CLIApp
     include GLI::App
+
+    def reset
+      super
+      @subcommand_option_handling_strategy = :normal
+    end
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.5.6
-  prerelease: 
+  version: 2.6.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -173,6 +173,8 @@ files:
   ZmVhdHVyZXMvc3VwcG9ydC9lbnYucmI=
 - !binary |-
   ZmVhdHVyZXMvdG9kby5mZWF0dXJl
+- !binary |-
+  ZmVhdHVyZXMvdG9kb19sZWdhY3kuZmVhdHVyZQ==
 - !binary |-
   Z2xpLmNoZWF0
 - !binary |-
@@ -187,6 +189,8 @@ files:
   bGliL2dsaS9hcHBfc3VwcG9ydC5yYg==
 - !binary |-
   bGliL2dsaS9jb21tYW5kLnJi
+- !binary |-
+  bGliL2dsaS9jb21tYW5kX2ZpbmRlci5yYg==
 - !binary |-
   bGliL2dsaS9jb21tYW5kX2xpbmVfb3B0aW9uLnJi
 - !binary |-
@@ -237,18 +241,20 @@ files:
   bGliL2dsaS9jb21tYW5kcy9yZG9jX2RvY3VtZW50X2xpc3RlbmVyLnJi
 - !binary |-
   bGliL2dsaS9jb21tYW5kcy9zY2FmZm9sZC5yYg==
-- !binary |-
-  bGliL2dsaS9jb3B5X29wdGlvbnNfdG9fYWxpYXNlcy5yYg==
 - !binary |-
   bGliL2dsaS9kc2wucmI=
 - !binary |-
   bGliL2dsaS9leGNlcHRpb25zLnJi
 - !binary |-
   bGliL2dsaS9mbGFnLnJi
+- !binary |-
+  bGliL2dsaS9nbGlfb3B0aW9uX2Jsb2NrX3BhcnNlci5yYg==
 - !binary |-
   bGliL2dsaS9nbGlfb3B0aW9uX3BhcnNlci5yYg==
 - !binary |-
   bGliL2dsaS9vcHRpb25fcGFyc2VyX2ZhY3RvcnkucmI=
+- !binary |-
+  bGliL2dsaS9vcHRpb25fcGFyc2luZ19yZXN1bHQucmI=
 - !binary |-
   bGliL2dsaS9vcHRpb25zLnJi
 - !binary |-
@@ -273,6 +279,8 @@ files:
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbGlzdC5yYg==
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbHMucmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbWFrZS5yYg==
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vdmVyc2lvbi5yYg==
 - !binary |-
@@ -281,6 +289,30 @@ files:
   dGVzdC9hcHBzL3RvZG8vdG9kby5nZW1zcGVj
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vdG9kby5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L0dlbWZpbGU=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L1JFQURNRS5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L1Jha2VmaWxl
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2Jpbi90b2Rv
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2NyZWF0
+  ZS5yYg==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2xpc3Qu
+  cmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2xzLnJi
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL3ZlcnNpb24ucmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3Rlc3QvdGNfbm90aGluZy5yYg==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3RvZG8uZ2Vtc3BlYw==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3RvZG8ucmRvYw==
 - !binary |-
   dGVzdC9hcHBzL3RvZG9fcGx1Z2lucy9jb21tYW5kcy90aGlyZC5yYg==
 - !binary |-
@@ -294,7 +326,7 @@ files:
 - !binary |-
   dGVzdC90Y19jb21tYW5kLnJi
 - !binary |-
-  dGVzdC90Y19jb21wb3VudF9jb21tYW5kLnJi
+  dGVzdC90Y19jb21wb3VuZF9jb21tYW5kLnJi
 - !binary |-
   dGVzdC90Y19kb2MucmI=
 - !binary |-
@@ -305,6 +337,8 @@ files:
   dGVzdC90Y19oZWxwLnJi
 - !binary |-
   dGVzdC90Y19vcHRpb25zLnJi
+- !binary |-
+  dGVzdC90Y19zdWJjb21tYW5kX3BhcnNpbmcucmI=
 - !binary |-
   dGVzdC90Y19zdWJjb21tYW5kcy5yYg==
 - !binary |-
@@ -333,16 +367,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4071846445678563052
+      hash: -2077859074459195456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -4071846445678563052
+      version: 1.3.1
 requirements: []
 rubyforge_project: gli
 rubygems_version: 1.8.25
@@ -365,6 +396,8 @@ test_files:
   ZmVhdHVyZXMvc3VwcG9ydC9lbnYucmI=
 - !binary |-
   ZmVhdHVyZXMvdG9kby5mZWF0dXJl
+- !binary |-
+  ZmVhdHVyZXMvdG9kb19sZWdhY3kuZmVhdHVyZQ==
 - !binary |-
   dGVzdC9hcHBzL1JFQURNRS5tZA==
 - !binary |-
@@ -381,6 +414,8 @@ test_files:
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbGlzdC5yYg==
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbHMucmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vY29tbWFuZHMvbWFrZS5yYg==
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vbGliL3RvZG8vdmVyc2lvbi5yYg==
 - !binary |-
@@ -389,6 +424,30 @@ test_files:
   dGVzdC9hcHBzL3RvZG8vdG9kby5nZW1zcGVj
 - !binary |-
   dGVzdC9hcHBzL3RvZG8vdG9kby5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L0dlbWZpbGU=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L1JFQURNRS5yZG9j
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L1Jha2VmaWxl
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2Jpbi90b2Rv
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2NyZWF0
+  ZS5yYg==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2xpc3Qu
+  cmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL2NvbW1hbmRzL2xzLnJi
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L2xpYi90b2RvL3ZlcnNpb24ucmI=
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3Rlc3QvdGNfbm90aGluZy5yYg==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3RvZG8uZ2Vtc3BlYw==
+- !binary |-
+  dGVzdC9hcHBzL3RvZG9fbGVnYWN5L3RvZG8ucmRvYw==
 - !binary |-
   dGVzdC9hcHBzL3RvZG9fcGx1Z2lucy9jb21tYW5kcy90aGlyZC5yYg==
 - !binary |-
@@ -402,7 +461,7 @@ test_files:
 - !binary |-
   dGVzdC90Y19jb21tYW5kLnJi
 - !binary |-
-  dGVzdC90Y19jb21wb3VudF9jb21tYW5kLnJi
+  dGVzdC90Y19jb21wb3VuZF9jb21tYW5kLnJi
 - !binary |-
   dGVzdC90Y19kb2MucmI=
 - !binary |-
@@ -413,6 +472,8 @@ test_files:
   dGVzdC90Y19oZWxwLnJi
 - !binary |-
   dGVzdC90Y19vcHRpb25zLnJi
+- !binary |-
+  dGVzdC90Y19zdWJjb21tYW5kX3BhcnNpbmcucmI=
 - !binary |-
   dGVzdC90Y19zdWJjb21tYW5kcy5yYg==
 - !binary |-