rename json to minijson and fulljson to json

inspec · May 4, 2016 · 7c3145e · 7c3145e
1 parent 0974d63
commit 7c3145e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/inspec/rspec_json_formatter.rb b/lib/inspec/rspec_json_formatter.rb
@@ -21,7 +21,7 @@ def format_example(example)
 
 # Minimal JSON formatter for inspec. Only contains limited information about
 # examples without any extras.
-class InspecRspecJson < RSpec::Core::Formatters::JsonFormatter
+class InspecRspecMiniJson < RSpec::Core::Formatters::JsonFormatter
   RSpec::Core::Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :close
 
   def dump_summary(summary)
@@ -71,7 +71,7 @@ def format_example(example)
   end
 end
 
-class InspecRspecFullJson < InspecRspecJson
+class InspecRspecJson < InspecRspecMiniJson
   RSpec::Core::Formatters.register self, :message, :dump_summary, :dump_profile, :stop, :close
 
   def add_profile(profile)

diff --git a/lib/inspec/runner_rspec.rb b/lib/inspec/runner_rspec.rb
@@ -33,7 +33,7 @@ def example_group(*args, &block)
     # @return [nil]
     def add_profile(profile)
       RSpec.configuration.formatters
-           .find_all { |c| c.is_a? InspecRspecFullJson }
+           .find_all { |c| c.is_a? InspecRspecJson }
            .each do |fmt|
         fmt.add_profile(profile)
       end
@@ -82,9 +82,9 @@ def reset_tests
     end
 
     FORMATTERS = {
+      'json-min' => 'InspecRspecMinJson',
       'json' => 'InspecRspecJson',
-      'fulljson' => 'InspecRspecFullJson',
-      'rspecjson' => 'InspecRspecVanilla',
+      'json-rspec' => 'InspecRspecVanilla',
     }.freeze
 
     # Configure the output formatter and stream to be used with RSpec.