test/test_helper.rb in rocketjob-1.0.0 vs test/test_helper.rb in rocketjob-1.1.0

- old
+ new

@@ -13,24 +13,25 @@ SemanticLogger.add_appender('test.log', &SemanticLogger::Appender::Base.colorized_formatter) SemanticLogger.default_level = :debug # Setup MongoMapper from mongo config file -config_file = File.join(File.dirname(__FILE__), 'config', 'mongo.yml') -if config = YAML.load(ERB.new(File.read(config_file)).result) - cfg = config['test'] - options = cfg['options'] || {} - options[:logger] = SemanticLogger::DebugAsTraceLogger.new('Mongo') +config_file = File.join(File.dirname(__FILE__), 'config', 'mongo.yml') +config = YAML.load(ERB.new(File.read(config_file)).result) +if config + cfg = config['test'] + options = cfg['options'] || {} + options[:logger] = SemanticLogger::DebugAsTraceLogger.new('Mongo') MongoMapper.config = cfg MongoMapper.connection = Mongo::MongoClient.from_uri(cfg['uri'], options) MongoMapper.database = MongoMapper.connection.db.name # If this environment has a separate Work server - if cfg = config['test_work'] - options = cfg['options'] || {} - options[:logger] = SemanticLogger::DebugAsTraceLogger.new('MongoWork') + if (cfg = config['test_work']) + options = cfg['options'] || {} + options[:logger] = SemanticLogger::DebugAsTraceLogger.new('MongoWork') RocketJob::Config.mongo_work_connection = Mongo::MongoClient.from_uri(cfg['uri'], options) end end # Test cipher @@ -38,6 +39,5 @@ cipher_name: 'aes-128-cbc', key: '1234567890ABCDEF1234567890ABCDEF', iv: '1234567890ABCDEF', encoding: :base64strict ) -