Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add fix for YAML deserialization in log entry

Rafal Cymerys8b99d9f95d37
diff --git a/core/app/models/spree/log_entry.rb b/core/app/models/spree/log_entry.rb
index 20da2fe73a..e310255332 100644
--- a/core/app/models/spree/log_entry.rb
+++ b/core/app/models/spree/log_entry.rb
@@ -15,7 +15,11 @@ module Spree
end
def parsed_details
- @details ||= YAML.safe_load(details, [ActiveMerchant::Billing::Response])
+ @details ||= if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+ YAML.safe_load(details, permitted_classes: [ActiveMerchant::Billing::Response])
+ else
+ YAML.safe_load(details, [ActiveMerchant::Billing::Response])
+ end
end
end
end
diff --git a/core/spec/models/spree/log_entry_spec.rb b/core/spec/models/spree/log_entry_spec.rb
new file mode 100644
index 0000000000..260dfc7d16
--- /dev/null
+++ b/core/spec/models/spree/log_entry_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Spree::LogEntry, type: :model do
+ let(:log_entry) { create(:log_entry, details: details) }
+ let(:details) { "--- !ruby/object:ActiveMerchant::Billing::Response\nparams: {}\nmessage: 'Bogus Gateway: Forced success'\nsuccess: true\ntest: true\nauthorization: \nfraud_review: \nerror_code: \nemv_authorization: \nnetwork_transaction_id: \navs_result:\n code: \n message: \n street_match: \n postal_match: \ncvv_result:\n code: \n message: \n" }
+
+ describe '#parsed_details' do
+ subject { log_entry.parsed_details }
+
+ it 'deserializes log entry with billing response' do
+ expect(subject).to be_instance_of(ActiveMerchant::Billing::Response)
+ expect(subject.message).to eq('Bogus Gateway: Forced success')
+ end
+ end
+end