spec/connection_spec.rb in forj-0.0.43 vs spec/connection_spec.rb in forj-0.0.44

@@ -20,32 +20,31 @@
 
 require 'fog'
 
 $APP_PATH = File.dirname(__FILE__)
 $LIB_PATH = File.expand_path(File.join(File.dirname($APP_PATH),'lib'))
-$FORJ_DATA_PATH= File.expand_path('~/.forj')
 
-$LOAD_PATH << './lib'
+$LOAD_PATH << $LIB_PATH
 
-require 'forj-config.rb' # Load class ForjConfig
-require 'log.rb' # Load default loggers
-require 'connection.rb' # Load class ForjConnection
-require 'forj-account.rb'
+require 'appinit.rb' # Load generic Application level function
 
 # Initialize forj paths
-ensure_forj_dirs_exists()
+AppInit::forj_initialize()
 
-include Logging
-
+# Initialize global Log object
 $FORJ_LOGGER=ForjLog.new('forj-rspec.log', Logger::FATAL)
 
+require 'forj-config.rb' # Load class ForjConfig
+require 'connection.rb' # Load class ForjConnection
+require 'forj-account.rb'
 
+
 describe 'Module: forj-connection' do
 
   it 'should connect to hpcloud (smoke test)' do
 
     Fog.mock!
-    conn = ForjConnection.new(ForjConfig.new())
+    conn = ForjConnection.new(ForjAccount.new(ForjConfig.new()))
     expect(conn).to be
 
     Fog::Mock.reset
   end
 end