Skip to content

Allow start/end checks on empty strings #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2020
Merged

Allow start/end checks on empty strings #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puppet/functions/stdlib/end_with.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# 'foobar'.stdlib::end_with(['foo', 'baz']) => false
# @return [Boolean] True or False
dispatch :end_with do
param 'String[1]', :test_string
param 'String', :test_string
param 'Variant[String[1],Array[String[1], 1]]', :suffixes
return_type 'Boolean'
end
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/functions/stdlib/start_with.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# 'foObar'.stdlib::start_with(['bar', 'baz']) => false
# @return [Boolean] True or False
dispatch :start_with do
param 'String[1]', :test_string
param 'String', :test_string
param 'Variant[String[1],Array[String[1], 1]]', :prefixes
return_type 'Boolean'
end
Expand Down
6 changes: 1 addition & 5 deletions spec/functions/end_with_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
require 'spec_helper'

describe 'stdlib::end_with' do
it { is_expected.to run.with_params('', 'bar').and_return(false) }
it { is_expected.to run.with_params('foobar', 'bar').and_return(true) }
it { is_expected.to run.with_params('foobar', 'foo').and_return(false) }
it { is_expected.to run.with_params('foobar', ['foo', 'baz']).and_return(false) }
it do
is_expected.to run.with_params('', 'foo').and_raise_error(
ArgumentError, %r{'stdlib::end_with' parameter 'test_string' expects a String\[1\] value}
)
end
it do
is_expected.to run.with_params('foobar', '').and_raise_error(
ArgumentError, %r{'stdlib::end_with' parameter 'suffixes' expects a value of type String\[1\] or Array\[String\[1\], 1\]}
Expand Down
1 change: 1 addition & 0 deletions spec/functions/startswith_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
it { is_expected.to run.with_params.and_raise_error(ArgumentError, %r{expects 2 arguments, got none}i) }
it { is_expected.to run.with_params('').and_raise_error(ArgumentError, %r{expects 2 arguments, got 1}) }

it { is_expected.to run.with_params('', 'foo').and_return(false) }
it { is_expected.to run.with_params('foobar', 'foo').and_return(true) }
it { is_expected.to run.with_params('foObar', ['bar', 'baz']).and_return(false) }
end