solidus_backend 2.10.2 → 2.11.3

data/lib/spree/backend_configuration.rb

@@ -131,7 +131,20 @@ module Spree
         MenuItem.new(
           CONFIGURATION_TABS,
           'wrench',
-          condition: -> { can?(:admin, Spree::Store) },
+          condition: -> {
+            can?(:admin, Spree::Store) ||
+            can?(:admin, Spree::AdjustmentReason) ||
+            can?(:admin, Spree::PaymentMethod) ||
+            can?(:admin, Spree::RefundReason) ||
+            can?(:admin, Spree::ReimbursementType) ||
+            can?(:admin, Spree::ShippingCategory) ||
+            can?(:admin, Spree::ShippingMethod) ||
+            can?(:admin, Spree::StockLocation) ||
+            can?(:admin, Spree::TaxCategory) ||
+            can?(:admin, Spree::TaxRate) ||
+            can?(:admin, Spree::ReturnReason) ||
+            can?(:admin, Spree::Zone)
+          },
           label: :settings,
           partial: 'spree/admin/shared/settings_sub_menu',
           url: :admin_stores_path,

data/solidus_backend.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(spec|script)/})
+  end
 
-  s.required_ruby_version = '>= 2.4.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.3
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.11.3
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,9 @@ files:
 - app/assets/javascripts/spree/backend/components/admin_nav.js
 - app/assets/javascripts/spree/backend/components/editable_table.js
 - app/assets/javascripts/spree/backend/components/number_with_currency.js
+- app/assets/javascripts/spree/backend/components/selectable_table.js
+- app/assets/javascripts/spree/backend/components/selectable_table/return_items.js
+- app/assets/javascripts/spree/backend/components/selectable_table/summary.js
 - app/assets/javascripts/spree/backend/components/sortable_table.js
 - app/assets/javascripts/spree/backend/components/tabs.js
 - app/assets/javascripts/spree/backend/components/tooltips.js
@@ -223,9 +226,9 @@ files:
 - app/assets/javascripts/spree/backend/progress.js
 - app/assets/javascripts/spree/backend/promotions.js
 - app/assets/javascripts/spree/backend/promotions/activation.js
-- app/assets/javascripts/spree/backend/returns/return_item_selection.js
 - app/assets/javascripts/spree/backend/routes.js
 - app/assets/javascripts/spree/backend/shipments.js
+- app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js
 - app/assets/javascripts/spree/backend/spree-select2.js
 - app/assets/javascripts/spree/backend/stock_management.js
 - app/assets/javascripts/spree/backend/store_credits.js
@@ -246,6 +249,8 @@ files:
 - app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
 - app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
 - app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs
+- app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs
+- app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
 - app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
 - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
@@ -281,6 +286,10 @@ files:
 - app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js
 - app/assets/javascripts/spree/backend/views/tables/editable_table.js
 - app/assets/javascripts/spree/backend/views/tables/editable_table_row.js
+- app/assets/javascripts/spree/backend/views/tables/return_items.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js
+- app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js
 - app/assets/javascripts/spree/backend/views/zones/form.js
 - app/assets/javascripts/spree/backend/zone.js
 - app/assets/stylesheets/spree/backend.css
@@ -389,6 +398,7 @@ files:
 - app/controllers/spree/admin/taxonomies_controller.rb
 - app/controllers/spree/admin/taxons/attachment_controller.rb
 - app/controllers/spree/admin/taxons_controller.rb
+- app/controllers/spree/admin/users/api_key_controller.rb
 - app/controllers/spree/admin/users_controller.rb
 - app/controllers/spree/admin/variant_property_rule_values_controller.rb
 - app/controllers/spree/admin/variants_controller.rb
@@ -616,6 +626,7 @@ files:
 - app/views/spree/admin/shared/named_types/_new.html.erb
 - app/views/spree/admin/shared/preference_fields/_boolean.html.erb
 - app/views/spree/admin/shared/preference_fields/_decimal.html.erb
+- app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb
 - app/views/spree/admin/shared/preference_fields/_integer.html.erb
 - app/views/spree/admin/shared/preference_fields/_password.html.erb
 - app/views/spree/admin/shared/preference_fields/_string.html.erb
@@ -731,116 +742,7 @@ files:
 - lib/spree/backend/engine.rb
 - lib/spree/backend_configuration.rb
 - lib/spree_backend.rb
-- script/rails
 - solidus_backend.gemspec
-- spec/controllers/spree/admin/base_controller_spec.rb
-- spec/controllers/spree/admin/cancellations_controller_spec.rb
-- spec/controllers/spree/admin/customer_returns_controller_spec.rb
-- spec/controllers/spree/admin/locale_controller_spec.rb
-- spec/controllers/spree/admin/missing_products_controller_spec.rb
-- spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
-- spec/controllers/spree/admin/orders_controller_spec.rb
-- spec/controllers/spree/admin/payment_methods_controller_spec.rb
-- spec/controllers/spree/admin/payments_controller_spec.rb
-- spec/controllers/spree/admin/prices_controller_spec.rb
-- spec/controllers/spree/admin/product_properties_controller_spec.rb
-- spec/controllers/spree/admin/products_controller_spec.rb
-- spec/controllers/spree/admin/promotion_actions_controller_spec.rb
-- spec/controllers/spree/admin/promotion_codes_controller_spec.rb
-- spec/controllers/spree/admin/promotion_rules_controller_spec.rb
-- spec/controllers/spree/admin/promotions_controller_spec.rb
-- spec/controllers/spree/admin/refunds_controller_spec.rb
-- spec/controllers/spree/admin/reimbursements_controller_spec.rb
-- spec/controllers/spree/admin/resource_controller_spec.rb
-- spec/controllers/spree/admin/return_authorizations_controller_spec.rb
-- spec/controllers/spree/admin/return_items_controller_spec.rb
-- spec/controllers/spree/admin/root_controller_spec.rb
-- spec/controllers/spree/admin/search_controller_spec.rb
-- spec/controllers/spree/admin/shipping_methods_controller_spec.rb
-- spec/controllers/spree/admin/stock_items_controller_spec.rb
-- spec/controllers/spree/admin/stock_locations_controller_spec.rb
-- spec/controllers/spree/admin/store_credits_controller_spec.rb
-- spec/controllers/spree/admin/users_controller_spec.rb
-- spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/features/admin/configuration/payment_methods_spec.rb
-- spec/features/admin/configuration/shipping_methods_spec.rb
-- spec/features/admin/configuration/stock_locations_spec.rb
-- spec/features/admin/configuration/store_spec.rb
-- spec/features/admin/configuration/tax_categories_spec.rb
-- spec/features/admin/configuration/tax_rates_spec.rb
-- spec/features/admin/configuration/taxonomies_spec.rb
-- spec/features/admin/configuration/zones_spec.rb
-- spec/features/admin/homepage_spec.rb
-- spec/features/admin/javascript_format_money_spec.rb
-- spec/features/admin/locale_spec.rb
-- spec/features/admin/orders/adjustments_promotions_spec.rb
-- spec/features/admin/orders/adjustments_spec.rb
-- spec/features/admin/orders/cancelling_and_resuming_spec.rb
-- spec/features/admin/orders/cancelling_inventory_spec.rb
-- spec/features/admin/orders/customer_details_spec.rb
-- spec/features/admin/orders/customer_returns_spec.rb
-- spec/features/admin/orders/line_items_spec.rb
-- spec/features/admin/orders/listing_spec.rb
-- spec/features/admin/orders/log_entries_spec.rb
-- spec/features/admin/orders/new_order_spec.rb
-- spec/features/admin/orders/new_refund_spec.rb
-- spec/features/admin/orders/order_details_spec.rb
-- spec/features/admin/orders/payments_spec.rb
-- spec/features/admin/orders/return_authorizations_spec.rb
-- spec/features/admin/orders/return_payment_state_spec.rb
-- spec/features/admin/orders/risk_analysis_spec.rb
-- spec/features/admin/orders/shipments_spec.rb
-- spec/features/admin/payments/store_credits_spec.rb
-- spec/features/admin/products/edit/images_spec.rb
-- spec/features/admin/products/edit/products_spec.rb
-- spec/features/admin/products/edit/taxons_spec.rb
-- spec/features/admin/products/edit/variants_spec.rb
-- spec/features/admin/products/option_types_spec.rb
-- spec/features/admin/products/pricing_spec.rb
-- spec/features/admin/products/products_spec.rb
-- spec/features/admin/products/properties_spec.rb
-- spec/features/admin/products/stock_management_spec.rb
-- spec/features/admin/products/variant_spec.rb
-- spec/features/admin/promotion_adjustments_spec.rb
-- spec/features/admin/promotions/option_value_rule_spec.rb
-- spec/features/admin/promotions/product_rule_spec.rb
-- spec/features/admin/promotions/promotion_categories_spec.rb
-- spec/features/admin/promotions/promotion_code_batches_spec.rb
-- spec/features/admin/promotions/promotion_code_spec.rb
-- spec/features/admin/promotions/promotion_spec.rb
-- spec/features/admin/promotions/tiered_calculator_spec.rb
-- spec/features/admin/promotions/user_rule_spec.rb
-- spec/features/admin/reimbursements_spec.rb
-- spec/features/admin/store_credits_spec.rb
-- spec/features/admin/stores_spec.rb
-- spec/features/admin/style_guide_spec.rb
-- spec/features/admin/taxons_spec.rb
-- spec/features/admin/users_spec.rb
-- spec/fixtures/files/ror_ringer.jpeg
-- spec/helpers/admin/base_helper_spec.rb
-- spec/helpers/admin/navigation_helper_spec.rb
-- spec/helpers/admin/stock_movements_helper_spec.rb
-- spec/helpers/admin/store_credit_events_helper_spec.rb
-- spec/helpers/promotion_rules_helper_spec.rb
-- spec/javascripts/fixtures/_boot.html.erb
-- spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb
-- spec/javascripts/fixtures/number_with_currency/without_select.html.erb
-- spec/javascripts/format_money_spec.js
-- spec/javascripts/spec_helper.js
-- spec/javascripts/support/show_errors.js
-- spec/javascripts/support/with_translations.js
-- spec/javascripts/translation_spec.js
-- spec/javascripts/views/number_with_currency_spec.js
-- spec/lib/spree/backend_configuration/menu_item_spec.rb
-- spec/lib/spree/backend_configuration_spec.rb
-- spec/spec_helper.rb
-- spec/support/appear_before_matcher.rb
-- spec/support/feature/base_feature_helper.rb
-- spec/support/feature/order_feature_helper.rb
-- spec/teaspoon_env.rb
-- spec/test_views/spree/admin/widgets/edit.html.erb
-- spec/test_views/spree/admin/widgets/new.html.erb
-- spec/views/spree/admin/shared/navigation_footer_spec.rb
 - vendor/assets/fonts/inter/Inter-Regular.woff
 - vendor/assets/fonts/inter/Inter-Regular.woff2
 - vendor/assets/fonts/inter/Inter-SemiBold.woff
@@ -998,7 +900,7 @@ homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1006,16 +908,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
-requirements:
-- none
-rubygems_version: 3.0.3
-signing_key: 
+requirements: []
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.
 test_files: []

data/app/assets/javascripts/spree/backend/returns/return_item_selection.js

@@ -1,35 +0,0 @@
-Spree.ready(function() {
-  function checkAddItemBox() {
-    $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
-    updateSuggestedAmount();
-  }
-
-  function updateSuggestedAmount() {
-    var totalPretaxRefund = 0;
-    var checkedItems = formFields.find('input.add-item:checked');
-    $.each(checkedItems, function(i, checkbox) {
-      totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
-    });
-
-    var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
-    formFields.find('span#total_pre_tax_refund').html(displayTotal);
-  }
-
-  var formFields = $("[data-hook='admin_customer_return_form_fields'], \
-                     [data-hook='admin_return_authorization_form_fields']");
-
-  if(formFields.length > 0) {
-    updateSuggestedAmount();
-
-    formFields.find('input#select-all').on('change', function(ev) {
-      var checkBoxes = $(ev.currentTarget).parents('table:first').find('input.add-item');
-      checkBoxes.prop('checked', this.checked);
-      updateSuggestedAmount();
-    });
-
-    formFields.find('input.add-item').on('change', updateSuggestedAmount);
-    formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
-
-    formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
-  }
-});

data/script/rails

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/spree/backend/engine', __dir__)
-
-require 'rails/all'
-require 'rails/engine/commands'

data/spec/controllers/spree/admin/base_controller_spec.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-# Spree's rpsec controller tests get the Spree::ControllerHacks
-# we don't need those for the anonymous controller here, so
-# we call process directly instead of get
-require 'spec_helper'
-
-describe Spree::Admin::BaseController, type: :controller do
-  controller(Spree::Admin::BaseController) do
-    def index
-      authorize! :update, Spree::Order
-      render plain: 'test'
-    end
-  end
-
-  context "unauthorized request" do
-    before do
-      allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
-    end
-
-    it "redirects to unauthorized" do
-      get :index
-      expect(response).to redirect_to '/unauthorized'
-    end
-  end
-end

data/spec/controllers/spree/admin/cancellations_controller_spec.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Spree::Admin::CancellationsController do
-  stub_authorization!
-
-  describe "#index" do
-    subject { get :index, params: { order_id: order.number } }
-
-    let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
-
-    context "for an order with inventory" do
-      render_views
-
-      it "succeeds" do
-        expect(response).to be_ok
-      end
-    end
-  end
-
-  describe "#cancel" do
-    subject { post :short_ship, params: { order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) } }
-
-    let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 4 }]) }
-    let(:referer) { "order_admin_page" }
-
-    context "no inventory unit ids are provided" do
-      subject { post :short_ship, params: { order_id: order.number } }
-
-      it "redirects back" do
-        subject
-        expect(response).to redirect_to(spree.admin_order_cancellations_path(order))
-      end
-
-      it "sets an error message" do
-        subject
-        expect(flash[:error]).to eq I18n.t('spree.no_inventory_selected')
-      end
-    end
-
-    context "unable to find all the inventory" do
-      let(:inventory_units) { [Spree::InventoryUnit.new(id: -1)] }
-
-      it "redirects back" do
-        subject
-        expect(response).to redirect_to(spree.admin_order_cancellations_path(order))
-      end
-
-      it "sets an error message" do
-        subject
-        expect(flash[:error]).to eq I18n.t('spree.unable_to_find_all_inventory_units')
-      end
-    end
-
-    context "successfully cancels inventory" do
-      let(:inventory_units) { order.inventory_units.not_canceled }
-
-      it "redirects to admin order edit" do
-        subject
-        expect(response).to redirect_to(spree.edit_admin_order_path(order))
-      end
-
-      it "sets an success message" do
-        subject
-        expect(flash[:success]).to eq I18n.t('spree.inventory_canceled')
-      end
-
-      it "creates a unit cancel" do
-        expect { subject }.to change { Spree::UnitCancel.count }.by(4)
-      end
-
-      it "cancels the inventory" do
-        subject
-        expect(order.reload.inventory_units.map(&:state).uniq).to match_array(['canceled'])
-      end
-
-      it "adjusts the order" do
-        expect { subject }.to change { order.reload.total }.by(-40.0)
-      end
-    end
-  end
-end

data/spec/controllers/spree/admin/customer_returns_controller_spec.rb

@@ -1,235 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-module Spree
-  module Admin
-    describe CustomerReturnsController, type: :controller do
-      stub_authorization!
-
-      describe "#index" do
-        let(:order)           { customer_return.order }
-        let(:customer_return) { create(:customer_return) }
-
-        subject do
-          get :index, params: { order_id: customer_return.order.to_param }
-        end
-
-        before { subject }
-
-        it "loads the order" do
-          expect(assigns(:order)).to eq order
-        end
-
-        it "loads the customer return" do
-          expect(assigns(:customer_returns)).to include(customer_return)
-        end
-      end
-
-      describe "#new" do
-        let(:order) { create(:shipped_order, line_items_count: 1) }
-        let!(:inactive_reimbursement_type)      { create(:reimbursement_type, active: false) }
-        let!(:first_active_reimbursement_type)  { create(:reimbursement_type) }
-        let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
-
-        subject do
-          get :new, params: { order_id: order.to_param }
-        end
-
-        it "loads the order" do
-          subject
-          expect(assigns(:order)).to eq order
-        end
-
-        it "builds a new customer return" do
-          subject
-          expect(assigns(:customer_return)).to_not be_persisted
-        end
-
-        context "with previous customer return" do
-          let(:return_reason_1) { create(:return_reason) }
-          let(:return_reason_2) { create(:return_reason) }
-          let(:return_reason_3) { create(:return_reason) }
-          let!(:inactive_rma_reason) { create(:return_reason, active: false) }
-
-          let(:order) { create(:shipped_order, line_items_count: 4) }
-          let(:rma) { create(:return_authorization, order: order, reason: return_reason_1) }
-
-          let!(:rma_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.first, return_reason: return_reason_2) }
-          let!(:customer_return_return_item) { create(:return_item, return_authorization: nil, inventory_unit: order.inventory_units.last, return_reason: return_reason_3) }
-
-          context "all return items are associated with a customer return" do
-            let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [rma_return_item, customer_return_return_item]) }
-
-            before { subject }
-
-            it "loads the possible return items" do
-              total_inventory_count = 4
-              rma_return_items_count = 1
-              customer_return_return_items_count = 1
-              expect(assigns(:new_return_items).length).to eq(total_inventory_count - rma_return_items_count - customer_return_return_items_count)
-            end
-
-            it "builds new return items" do
-              expect(assigns(:new_return_items).all? { |return_item| !return_item.persisted? }).to eq true
-            end
-
-            it "does not have any rma return items" do
-              expect(assigns(:rma_return_items)).to eq []
-            end
-
-            it "loads the correct return authorization reasons" do
-              expect(assigns(:reasons)).to match_array([return_reason_1, return_reason_2, return_reason_3])
-            end
-          end
-
-          context "there is a return item associated with an rma but not a customer return" do
-            let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [customer_return_return_item]) }
-
-            before do
-              subject
-            end
-
-            it "loads the possible return items" do
-              rma_return_item_count = rma.return_items.count
-              total_unit_count = order.inventory_units.count
-              customer_returned_count = previous_customer_return.return_items.count
-              expected_total = total_unit_count - customer_returned_count - rma_return_item_count
-              expect(assigns(:new_return_items).length).to eq expected_total
-            end
-
-            it "builds new return items" do
-              expect(assigns(:new_return_items).all? { |return_item| !return_item.persisted? }).to eq true
-            end
-
-            it "loads the persisted rma return items" do
-              expect(assigns(:rma_return_items).all?(&:persisted?)).to eq true
-            end
-
-            it "has one rma return item" do
-              expect(assigns(:rma_return_items)).to include(rma_return_item)
-            end
-
-            it "loads the correct return authorization reasons" do
-              expect(assigns(:reasons)).to match_array([return_reason_1, return_reason_2, return_reason_3])
-            end
-          end
-        end
-      end
-
-      describe "#edit" do
-        let(:order)           { customer_return.order }
-        let(:customer_return) { create(:customer_return, line_items_count: 3) }
-
-        let!(:inactive_rma_reason) { create(:return_reason, active: false) }
-
-        let!(:accepted_return_item)            { customer_return.return_items.order('id').first.tap(&:accept!) }
-        let!(:rejected_return_item)            { customer_return.return_items.order('id').second.tap(&:reject!) }
-        let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
-
-        subject do
-          get :edit, params: { order_id: order.to_param, id: customer_return.to_param }
-        end
-
-        it "loads the order" do
-          subject
-          expect(assigns(:order)).to eq order
-        end
-
-        it "loads the customer return" do
-          subject
-          expect(assigns(:customer_return)).to eq customer_return
-        end
-
-        it "loads the accepted return items" do
-          subject
-          expect(assigns(:accepted_return_items)).to eq [accepted_return_item]
-        end
-
-        it "loads the rejected return items" do
-          subject
-          expect(assigns(:rejected_return_items)).to eq [rejected_return_item]
-        end
-
-        it "loads the return items that require manual intervention" do
-          subject
-          expect(assigns(:manual_intervention_return_items)).to eq [manual_intervention_return_item]
-        end
-
-        it "loads the return items that are still pending" do
-          subject
-          expect(assigns(:pending_return_items)).to eq []
-        end
-
-        it "loads the reimbursements that are still pending" do
-          subject
-          expect(assigns(:pending_reimbursements)).to eq []
-        end
-
-        it "loads the correct return authorization reasons" do
-          subject
-          expect(assigns(:reasons)).to match(Spree::ReturnReason.active)
-        end
-
-        context "a return item has an inactive return authorization reason" do
-          before(:each) do
-            accepted_return_item.update(return_reason_id: inactive_rma_reason.id)
-          end
-
-          it "includes the inactive return authorization reason" do
-            subject
-            expect(assigns(:reasons)).to match(Spree::ReturnReason.active + [inactive_rma_reason])
-          end
-        end
-      end
-
-      describe "#create" do
-        let(:order) { create(:shipped_order, line_items_count: 1) }
-        let(:reception_status_event) { 'receive' }
-        let(:stock_location_id) { order.shipments.last.stock_location.id }
-        let(:customer_return_params) do
-          {
-            order_id: order.to_param,
-            customer_return: {
-              stock_location_id: stock_location_id,
-              return_items_attributes: {
-                "0" => {
-                  returned: "1",
-                  amount: "15.99",
-                  inventory_unit_id: order.inventory_units.shipped.last.id,
-                  reception_status_event: reception_status_event
-                }
-              }
-            }
-          }
-        end
-
-        subject { post :create, params: customer_return_params }
-
-        it { expect { subject }.to change { Spree::CustomerReturn.count }.by(1) }
-        it do
-          subject
-          expect(response).to redirect_to spree.edit_admin_order_customer_return_path(order, id: Spree::CustomerReturn.last.id)
-        end
-
-        it 'executes the reception status event on the return items' do
-          subject
-          customer_return = Spree::CustomerReturn.last
-          expect(customer_return.return_items.map(&:reception_status).uniq).to eq ['received']
-        end
-
-        context "missing stock location" do
-          let(:stock_location_id) { '' }
-          it { expect{ subject }.to_not change { Spree::CustomerReturn.count } }
-          it { subject; expect(response).to render_template(:new) }
-        end
-
-        context "missing reception status event" do
-          let(:reception_status_event) { '' }
-          it { expect{ subject }.to_not change { Spree::CustomerReturn.count } }
-          it { subject; expect(response).to redirect_to spree.new_admin_order_customer_return_path(order) }
-        end
-      end
-    end
-  end
-end