spec/spec_helper.rb in beaker-vcloud-1.1.0 vs spec/spec_helper.rb in beaker-vcloud-2.0.0

@@ -1,31 +1,33 @@
+require 'beaker'
+require 'mock_vsphere'
+require 'mock_vsphere_helper'
+
 begin
   require 'simplecov'
   require 'simplecov-console'
   require 'codecov'
 rescue LoadError
+  # Do nothing if no required gem installed
 else
   SimpleCov.start do
     track_files 'lib/**/*.rb'
 
     add_filter '/spec'
-
-    enable_coverage :branch
-
     # do not track vendored files
     add_filter '/vendor'
     add_filter '/.vendor'
+
+    enable_coverage :branch
   end
 
   SimpleCov.formatters = [
     SimpleCov::Formatter::Console,
     SimpleCov::Formatter::Codecov,
   ]
 end
 
-require 'rspec/its'
-require 'beaker'
-require 'beaker/hypervisor/vcloud'
+Dir['./lib/beaker/hypervisor/*.rb'].sort.each { |file| require file }
 
 # setup & require beaker's spec_helper.rb
 beaker_gem_spec = Gem::Specification.find_by_name('beaker')
 beaker_gem_dir = beaker_gem_spec.gem_dir
 beaker_spec_path = File.join(beaker_gem_dir, 'spec')