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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix Rubocop warnings.
Sebastian Palma2a8fe26f9c89
diff --git a/api/app/services/spree/webhooks/endpoints/make_request.rb b/api/app/services/spree/webhooks/endpoints/make_request.rbindex 4c7c758833..31b08e7492 100644--- a/api/app/services/spree/webhooks/endpoints/make_request.rb+++ b/api/app/services/spree/webhooks/endpoints/make_request.rb@@ -43,10 +43,10 @@ module Spreeenddef failed_request?- !(request_code_type.in?(200...300))+ !(200...300).include?(request_status_code)end- def request_code_type+ def request_status_codehttp = Net::HTTP.new(uri_host, uri_port)http.use_ssl = true unless Rails.env.development? || Rails.env.test?http.request(request).code.to_idiff --git a/api/spec/services/spree/webhooks/endpoints/make_request_spec.rb b/api/spec/services/spree/webhooks/endpoints/make_request_spec.rbindex 3ad0ce07f7..3db3fd4fb6 100644--- a/api/spec/services/spree/webhooks/endpoints/make_request_spec.rb+++ b/api/spec/services/spree/webhooks/endpoints/make_request_spec.rb@@ -57,8 +57,8 @@ describe Spree::Webhooks::Endpoints::MakeRequest doshared_examples 'makes the request without setting use_ssl' doit 'does not set use_ssl' do- expect(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_return(http)- expect(http).to_not receive(:use_ssl=)+ allow(Net::HTTP).to receive(:new).with(uri.host, uri.port).and_return(http)+ expect(http).not_to receive(:use_ssl=)subjectend@@ -87,7 +87,7 @@ describe Spree::Webhooks::Endpoints::MakeRequest dolet(:url) { 'http://google.com/' }it 'does set use_ssl' do- expect(Net::HTTP).to receive(:new).and_return(http)+ allow(Net::HTTP).to receive(:new).and_return(http)expect(http).to receive(:use_ssl=).with(true)subjectend@@ -101,14 +101,14 @@ describe Spree::Webhooks::Endpoints::MakeRequest doendend- context 'when request code_type is not 2xx' do+ context 'when request status code is not 2xx' dobefore dohttp_double = instance_double(Net::HTTP)allow(Net::HTTP).to receive(:new).and_return(http_double)allow(http_double).to(receive(:request).and_return(double(:request).tap do |request|- allow(request).to receive(:code).and_return("304")+ allow(request).to receive(:code).and_return('304')end))@@ -124,7 +124,7 @@ describe Spree::Webhooks::Endpoints::MakeRequest doit { expect(subject).to eq(nil) }end- context 'when request code_type is 2xx' do+ context 'when request status code is 2xx' doit 'debug logs after the request and returns its value' domessage = "[SPREE WEBHOOKS] 'order.cancel' success for URL 'http://google.com/'"expect(subject).to eq(Rails.logger.debug(message))diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 9b72f3d58b..b5d6d5bc4a 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -63,7 +63,10 @@ module Spreeendself.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store]- self.whitelisted_ransackable_attributes = %w[completed_at email number state payment_state shipment_state total item_total considered_risky channel]+ self.whitelisted_ransackable_attributes = %w[+ completed_at email number state payment_state shipment_state+ total item_total considered_risky channel+ ]attr_reader :coupon_codeattr_accessor :temporary_address, :temporary_credit_card