From f164cd424b78f46bae1cb5bd9a5efabce04e1331 Mon Sep 17 00:00:00 2001 From: Jean byroot Boussier Date: Thu, 17 Feb 2022 15:58:19 +0100 Subject: [PATCH] Stop checking encoding names Comparing the names is much less efficient than comparing the instance directly. It may also change in the future: https://bugs.ruby-lang.org/issues/18576 --- spec/inputs/salesforce_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/inputs/salesforce_spec.rb b/spec/inputs/salesforce_spec.rb index 893e707..db74cfc 100644 --- a/spec/inputs/salesforce_spec.rb +++ b/spec/inputs/salesforce_spec.rb @@ -55,10 +55,10 @@ config.cassette_library_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'vcr_cassettes') config.hook_into :webmock config.before_record do |i| - if i.response.body.encoding.to_s == 'ASCII-8BIT' + if i.response.body.encoding == Encoding::BINARY # required because sfdc doesn't send back the content encoding and it # confuses the yaml parser - json_body = JSON.load(i.response.body.encode("ASCII-8BIT").force_encoding("utf-8")) + json_body = JSON.load(i.response.body.encode(Encoding::BINARY).force_encoding(Encoding::UTF_8)) i.response.body = json_body.to_json i.response.update_content_length_header end @@ -125,10 +125,10 @@ config.cassette_library_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'vcr_cassettes') config.hook_into :webmock config.before_record do |i| - if i.response.body.encoding.to_s == 'ASCII-8BIT' + if i.response.body.encoding == Encoding::BINARY # required because sfdc doesn't send back the content encoding and it # confuses the yaml parser - json_body = JSON.load(i.response.body.encode("ASCII-8BIT").force_encoding("utf-8")) + json_body = JSON.load(i.response.body.encode(Encoding::BINARY).force_encoding(Encoding::UTF_8)) i.response.body = json_body.to_json i.response.update_content_length_header end @@ -187,10 +187,10 @@ config.cassette_library_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'vcr_cassettes') config.hook_into :webmock config.before_record do |i| - if i.response.body.encoding.to_s == 'ASCII-8BIT' + if i.response.body.encoding == Encoding::BINARY # required because sfdc doesn't send back the content encoding and it # confuses the yaml parser - json_body = JSON.load(i.response.body.encode("ASCII-8BIT").force_encoding("utf-8")) + json_body = JSON.load(i.response.body.encode(Encoding::BINARY).force_encoding(Encoding::UTF_8)) i.response.body = json_body.to_json i.response.update_content_length_header end