Merge pull request #159 from pegasd/fix_return_type_matching

Fix return type matching for Puppet functions
This commit is contained in:
Eric Putnam 2018-02-24 16:12:36 -08:00 committed by GitHub
commit 0b1a095df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions

View File

@ -37,7 +37,7 @@ class PuppetStrings::Yard::Handlers::Puppet::FunctionHandler < PuppetStrings::Ya
def add_return_tag(object, type=nil)
tag = object.tag(:return)
if tag
if (type && tag.types) && (type != tag.types)
if (type && tag.types.first) && (type != tag.types.first)
log.warn "Documented return type does not match return type in function definition near #{statement.file}:#{statement.line}."
end

View File

@ -20,7 +20,7 @@ describe PuppetStrings::Yard::Handlers::Puppet::FunctionHandler, if: TEST_PUPPET
let(:source) { 'function foo{' }
it 'should log an error' do
expect{ subject }.to output(/\[error\]: Failed to parse \(stdin\): Syntax error at end of file/).to_stdout_from_any_process
expect{ subject }.to output(/\[error\]: Failed to parse \(stdin\): Syntax error at end of/).to_stdout_from_any_process
expect(subject.empty?).to eq(true)
end
end
@ -216,6 +216,21 @@ SOURCE
end
end
describe 'parsing a function with a non-conflicting return tag and type in function definition', if: TEST_FUNCTION_RETURN_TYPE do
let(:source) { <<-SOURCE
# A simple foo function
# @return [String] Hi there
function foo() >> String {
notice 'hi there'
}
SOURCE
}
it 'should not output a warning if return types match' do
expect{ subject }.not_to output(/Documented return type does not match return type in function definition/).to_stdout_from_any_process
end
end
describe 'parsing a function with a conflicting return tag and type in function definition', if: TEST_FUNCTION_RETURN_TYPE do
let(:source) { <<-SOURCE
# A simple foo function.