Merge pull request #4116 from inspec/zenspider/clean_more_requires

Clean more requires

lib/inspec/expect.rb

@@ -24,7 +24,7 @@ module Inspec
     def example_group
       that = self
 
-      opts = { 'caller' => calls[0][3] }
+      opts = { 'caller' => calls[0][3] } # TODO: this needs overhaul. no magic #s
       if !calls[0][3].nil? && !calls[0][3].empty? &&
          (m = calls[0][3][0].match(/^([^:]*):(\d+):/))
         opts['file_path'] = m[0]

test/helper.rb

@@ -101,10 +101,9 @@ require 'inspec/impact'
 require 'inspec/config'
 require 'fetchers/mock'
 require 'inspec/dependencies/cache'
-
-require_relative '../lib/bundles/inspec-supermarket'
-
+require 'bundles/inspec-supermarket'
 require 'train'
+
 CMD = Train.create('local', command_runner: :generic).connection
 TMP_CACHE = {}
 

test/unit/ui_test.rb

@@ -1,9 +1,6 @@
-# require 'helper'
-
 require 'minitest/autorun'
 require 'inspec/ui'
 require 'inspec/base_cli'
-require 'inspec/errors'
 require 'stringio'
 
 # https://gist.github.com/chrisopedia/8754917