From ba585064e1d6847a202f31ca3fcef7ab0a8aade1 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 15 May 2020 16:45:29 +0100 Subject: [PATCH] Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders --- app/controllers/spree/paypal_controller_decorator.rb | 2 +- app/services/checkout/post_checkout_actions.rb | 2 +- ...eset_order_service.rb => order_completion_reset.rb} | 8 +++++--- spec/controllers/checkout_controller_spec.rb | 10 +++++----- spec/services/checkout/post_checkout_actions_spec.rb | 4 ++-- ..._service_spec.rb => order_completion_reset_spec.rb} | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) rename app/services/{reset_order_service.rb => order_completion_reset.rb} (77%) rename spec/services/{reset_order_service_spec.rb => order_completion_reset_spec.rb} (97%) diff --git a/app/controllers/spree/paypal_controller_decorator.rb b/app/controllers/spree/paypal_controller_decorator.rb index 1512299198..0c620aeede 100644 --- a/app/controllers/spree/paypal_controller_decorator.rb +++ b/app/controllers/spree/paypal_controller_decorator.rb @@ -22,7 +22,7 @@ Spree::PaypalController.class_eval do if current_order.complete? flash[:notice] = t(:order_processed_successfully) - ResetOrderService.new(self, current_order).call + OrderCompletionReset.new(self, current_order).call session[:access_token] = current_order.token end end diff --git a/app/services/checkout/post_checkout_actions.rb b/app/services/checkout/post_checkout_actions.rb index 63e32e9185..f9adc32f57 100644 --- a/app/services/checkout/post_checkout_actions.rb +++ b/app/services/checkout/post_checkout_actions.rb @@ -9,7 +9,7 @@ module Checkout def success(controller, params, current_user) save_order_addresses_as_user_default(params, current_user) - ResetOrderService.new(controller, @order).call + OrderCompletionReset.new(controller, @order).call end def failure diff --git a/app/services/reset_order_service.rb b/app/services/order_completion_reset.rb similarity index 77% rename from app/services/reset_order_service.rb rename to app/services/order_completion_reset.rb index 402c377eb7..a9576c3977 100644 --- a/app/services/reset_order_service.rb +++ b/app/services/order_completion_reset.rb @@ -1,6 +1,8 @@ -# Builds a new order based on the one specified. This implements the "continue -# shopping" feature once an order is completed. -class ResetOrderService +# frozen_string_literal: false + +# Resets a completed order by building a new order based on the one specified. +# This implements the "continue shopping" feature once an order is completed. +class OrderCompletionReset # Constructor # # @param controller [#expire_current_order, #current_order] diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb index ccbf458674..a4adea7ba5 100644 --- a/spec/controllers/checkout_controller_spec.rb +++ b/spec/controllers/checkout_controller_spec.rb @@ -4,7 +4,7 @@ describe CheckoutController, type: :controller do let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) } let(:order_cycle) { create(:simple_order_cycle) } let(:order) { create(:order) } - let(:reset_order_service) { double(ResetOrderService) } + let(:reset_order_service) { double(OrderCompletionReset) } before do allow(order).to receive(:checkout_allowed?).and_return true @@ -117,8 +117,8 @@ describe CheckoutController, type: :controller do let(:test_shipping_method_id) { "111" } before do - # stub order and resetorderservice - allow(ResetOrderService).to receive(:new).with(controller, order) { reset_order_service } + # stub order and OrderCompletionReset + allow(OrderCompletionReset).to receive(:new).with(controller, order) { reset_order_service } allow(reset_order_service).to receive(:call) allow(order).to receive(:update_attributes).and_return true allow(controller).to receive(:current_order).and_return order @@ -211,7 +211,7 @@ describe CheckoutController, type: :controller do end it "returns order confirmation url on success" do - allow(ResetOrderService).to receive(:new).with(controller, order) { reset_order_service } + allow(OrderCompletionReset).to receive(:new).with(controller, order) { reset_order_service } expect(reset_order_service).to receive(:call) allow(order).to receive(:update_attributes).and_return true @@ -232,7 +232,7 @@ describe CheckoutController, type: :controller do describe "stale object handling" do it "retries when a stale object error is encountered" do - allow(ResetOrderService).to receive(:new).with(controller, order) { reset_order_service } + allow(OrderCompletionReset).to receive(:new).with(controller, order) { reset_order_service } expect(reset_order_service).to receive(:call) allow(order).to receive(:update_attributes).and_return true diff --git a/spec/services/checkout/post_checkout_actions_spec.rb b/spec/services/checkout/post_checkout_actions_spec.rb index 594671a908..dfda22f4d2 100644 --- a/spec/services/checkout/post_checkout_actions_spec.rb +++ b/spec/services/checkout/post_checkout_actions_spec.rb @@ -11,10 +11,10 @@ describe Checkout::PostCheckoutActions do let(:params) { { order: {} } } let(:current_user) { order.distributor.owner } - let(:reset_order_service) { instance_double(ResetOrderService) } + let(:reset_order_service) { instance_double(OrderCompletionReset) } before do - expect(ResetOrderService).to receive(:new). + expect(OrderCompletionReset).to receive(:new). with(controller, order).and_return(reset_order_service) expect(reset_order_service).to receive(:call) end diff --git a/spec/services/reset_order_service_spec.rb b/spec/services/order_completion_reset_spec.rb similarity index 97% rename from spec/services/reset_order_service_spec.rb rename to spec/services/order_completion_reset_spec.rb index e02cdb25e3..0aab4b2fcc 100644 --- a/spec/services/reset_order_service_spec.rb +++ b/spec/services/order_completion_reset_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ResetOrderService do +describe OrderCompletionReset do let(:current_token) { double(:current_token) } let(:current_distributor) { double(:distributor) } let(:current_order) do