spec/spec_helper.rb in vvm-rb-0.2.2 vs spec/spec_helper.rb in vvm-rb-1.0.0

@@ -12,33 +12,29 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'fileutils'
 require 'tmpdir'
-require 'vvm-rb'
-include VvmRb
+require 'vvm'
 
-support = File.join(File.dirname(__FILE__), 'support', '**', '*.rb')
-Dir[support].each { |f| require f }
-
 VERSION1, VERSION2 = 'v7-4-083', 'v7-4-103'
 
 # [todo] - test is too slow
 
 RSpec.configure do |config|
   config.before :suite do
     cache_dir = get_cache_dir
     unless File.exist?(cache_dir)
       ENV['VVMROOT'] = cache_dir
       FileUtils.mkdir_p(cache_dir)
-      Installer.fetch
+      Vvm::Installer.fetch
       [VERSION1, VERSION2].each do |v|
         i = Installer.new(v, [], true)
         i.checkout
         i.configure
         i.make_install
       end
-      Installer.cp_etc
+      Vvm::Installer.cp_etc
     end
   end
 
   config.before :all do
     @tmp = Dir.mktmpdir