Skip to content

Commit 0cb4940

Browse files
[FSSDK-7825] fix errant test logging (#333)
* use provided logger for errors * fix tests
1 parent b8cee28 commit 0cb4940

File tree

4 files changed

+44
-83
lines changed

4 files changed

+44
-83
lines changed

lib/optimizely/config/datafile_project_config.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,19 @@ def self.create(datafile, logger, error_handler, skip_json_validation)
184184
# skip_json_validation - Optional boolean param which allows skipping JSON schema
185185
# validation upon object invocation. By default JSON schema validation will be performed.
186186
# Returns instance of DatafileProjectConfig, nil otherwise.
187+
logger ||= SimpleLogger.new
187188
if !skip_json_validation && !Helpers::Validator.datafile_valid?(datafile)
188-
default_logger = SimpleLogger.new
189-
default_logger.log(Logger::ERROR, InvalidInputError.new('datafile').message)
189+
logger.log(Logger::ERROR, InvalidInputError.new('datafile').message)
190190
return nil
191191
end
192192

193193
begin
194194
config = new(datafile, logger, error_handler)
195195
rescue StandardError => e
196-
default_logger = SimpleLogger.new
197196
error_to_handle = e.instance_of?(InvalidDatafileVersionError) ? e : InvalidInputError.new('datafile')
198197
error_msg = error_to_handle.message
199198

200-
default_logger.log(Logger::ERROR, error_msg)
199+
logger.log(Logger::ERROR, error_msg)
201200
error_handler.handle_error error_to_handle
202201
return nil
203202
end

spec/event_builder_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
@config_body = OptimizelySpec::VALID_CONFIG_BODY
2828
@config_body_json = OptimizelySpec::VALID_CONFIG_BODY_JSON
2929
@error_handler = Optimizely::NoOpErrorHandler.new
30-
@logger = Optimizely::SimpleLogger.new
3130
end
3231

3332
before(:example) do
33+
@logger = spy('logger')
3434
config = Optimizely::DatafileProjectConfig.new(@config_body_json, @logger, @error_handler)
3535
@event_builder = Optimizely::EventBuilder.new(@logger)
3636
@event = config.get_event_from_key('test_event')

spec/notification_center_registry_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
end
3939

4040
it 'should return notification center with odp callback' do
41-
sdk_key = 'VALID'
41+
sdk_key = 'VALID_KEY'
4242
stub_request(:get, "https://cdn.optimizely.com/datafiles/#{sdk_key}.json")
4343
.to_return(status: 200, body: config_body_JSON)
4444

0 commit comments

Comments
 (0)