1 files changed, 1 insertions, 79 deletions

diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index 0758dacd6d..bd8774b9c5 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -16,9 +16,6 @@
 # limitations under the License.
 #
 
-require 'chef/audit'
-require 'chef/audit/audit_event_proxy'
-require 'chef/audit/rspec_formatter'
 require 'chef/config'
 
 class Chef
@@ -33,83 +30,8 @@ class Chef
       end
 
       def run
-        setup
-        register_controls_groups
-
-        # The first parameter passed to RSpec::Core::Runner.new
-        # is an instance of RSpec::Core::ConfigurationOptions, which is
-        # responsible for processing command line options passed through rspec.
-        # This then gets merged with the configuration. We'll just communicate
-        # directly with the Configuration here.
-        audit_runner = RSpec::Core::Runner.new(nil, configuration, world)
-        audit_runner.run_specs(world.ordered_example_groups)
-      end
-
-      private
-
-      # RSpec configuration and world objects are heavy, so let's wait until
-      # we actually need them.
-      def configuration
-        RSpec.configuration
-      end
-
-      def world
-        RSpec.world
-      end
-
-      # Configure audits before run.
-      # Sets up where output and error streams should stream to, adds formatters
-      # for people-friendly output of audit results and json for reporting. Also
-      # configures expectation frameworks.
-      def setup
-        # We're setting the output stream, but that will only be used for error situations
-        # Our formatter forwards events to the Chef event message bus
-        # TODO so some testing to see if these output to a log file - we probably need
-        # to register these before any formatters are added.
-        configuration.output_stream = Chef::Config[:log_location]
-        configuration.error_stream  = Chef::Config[:log_location]
-        # TODO im pretty sure I only need this because im running locally in rvmsudo
-        configuration.backtrace_exclusion_patterns.push(Regexp.new("/Users".gsub("/", File::SEPARATOR)))
-        configuration.backtrace_exclusion_patterns.push(Regexp.new("(eval)"))
-        configuration.color = Chef::Config[:color]
-        configuration.expose_dsl_globally = false
-
-        add_formatters
-        disable_should_syntax
-        configure_specinfra
+        run_context.controls_groups.each { |ctls_grp| ctls_grp.run }
       end
-
-      def add_formatters
-        configuration.add_formatter(Chef::Audit::RspecFormatter)
-        configuration.add_formatter(Chef::Audit::AuditEventProxy)
-        Chef::Audit::AuditEventProxy.events = run_context.events
-      end
-
-      # Explicitly disable :should syntax.
-      #
-      # :should is deprecated in RSpec 3 and we have chosen to explicitly disable it
-      # in audits. If :should is used in an audit, the audit will fail with error
-      # message "undefined method `:should`" rather than issue a deprecation warning.
-      #
-      # This can be removed when :should is fully removed from RSpec.
-      def disable_should_syntax
-        configuration.expect_with :rspec do |c|
-          c.syntax = :expect
-        end
-      end
-
-      def configure_specinfra
-        # TODO: We may need to change this based on operating system (there is a
-        # powershell backend) or roll our own.
-        Specinfra.configuration.backend = :exec
-      end
-
-      # Register each controls group with the world, which will handle
-      # the ordering of the audits that will be run.
-      def register_controls_groups
-        run_context.controls_groups.each { |ctls_grp| world.register(ctls_grp) }
-      end
-
     end
   end
 end