Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-27 15:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix reporter/formatter disagreements

Browse source 
reporters didnt stick to the formatters that were configured but looked for an old json one. this MR ensures that the formatter that is configured is pulled out to generate the report
This commit is contained in:
Dominik Richter 2016-05-18 17:21:01 +02:00
parent 820a942fa3
commit b54b4309da
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/inspec/runner_rspec.rb
View file

@ -14,6 +14,7 @@ module Inspec
class RunnerRspec
def initialize(conf)
@conf = conf
@formatter = nil
reset_tests
configure_output
end
@ -65,8 +66,12 @@ module Inspec
with.run_specs(tests)
end
# Provide an output hash of the run's report
#
# @return [Hash] a run's output hash
def report
reporter = RSpec.configuration.formatters.find { |f| f.is_a? Inspec::RSpecReporter }
reporter = @formatter || RSpec.configuration.formatters[0]
return nil if reporter.nil? || !reporter.respond_to?(:output_hash)
reporter.output_hash
end
@ -98,7 +103,7 @@ module Inspec
end
format = FORMATTERS[@conf['format']] || @conf['format'] || 'progress'
RSpec.configuration.add_formatter(format)
@formatter = RSpec.configuration.add_formatter(format)
RSpec.configuration.color = @conf['color']
setup_reporting if @conf['report']