solidus_backend 1.4.2 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba03f47f17381bdf7f3caad7115bf42b8b027776
-  data.tar.gz: 4a7cf28a01a6b334f268493e69b234d9c87c3da0
+  metadata.gz: 9267470530814d50f5b8a16a500e8cb925befd1b
+  data.tar.gz: 83c79928b8494a499d2b5751c2097c5068fbee2e
 SHA512:
-  metadata.gz: c42a8ac94bd7bda855ea7a89d1e7249619a1162d47c19bfa65592504110a2931a68f40106dfff95f8bd54a24bba06893c84c0440e3ff7125e71d9a26bac3e239
-  data.tar.gz: bcf874217d87f548adfaaf258ac778020832a9198b54156dab10066b721d07dbe91d5376324828f27538b3568e4c1fd0073a623f14cf99fa2656c209122a2db9
+  metadata.gz: ebd846a8b936f132716c78c353dd563fab27f70947cd806508c0b916c0c0e2b416f7ac31ecdc6050dc1f865812da650a0fedd428dfd433ca4f941201716edb47
+  data.tar.gz: 928184257e46c7aa8fb57ff3af8f831146b0c079a07c084a6542c85a4c4f4a49161219c9652f8e44dca7b784ecc1dad769671b83b392e5e1ea6717bfa2a88fb5

data/app/controllers/spree/admin/option_types_controller.rb

@@ -10,7 +10,7 @@ module Spree
 
         respond_to do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js { render text: 'Ok' }
+          format.js { render plain: 'Ok' }
         end
       end
 

data/app/controllers/spree/admin/option_values_controller.rb

@@ -4,7 +4,7 @@ module Spree
       def destroy
         option_value = Spree::OptionValue.find(params[:id])
         option_value.destroy
-        render text: nil
+        render plain: nil
       end
     end
   end

data/app/controllers/spree/admin/orders_controller.rb

@@ -127,26 +127,26 @@ module Spree
       def cancel
         @order.canceled_by(try_spree_current_user)
         flash[:success] = Spree.t(:order_canceled)
-        redirect_to :back
+        redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resume
         @order.resume!
         flash[:success] = Spree.t(:order_resumed)
-        redirect_to :back
+        redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def approve
         @order.contents.approve(user: try_spree_current_user)
         flash[:success] = Spree.t(:order_approved)
-        redirect_to :back
+        redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def resend
         OrderMailer.confirm_email(@order.id, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
-        redirect_to :back
+        redirect_to(spree.edit_admin_order_path(@order))
       end
 
       def unfinalize_adjustments
@@ -154,7 +154,7 @@ module Spree
         adjustments.each(&:unfinalize!)
         flash[:success] = Spree.t(:all_adjustments_unfinalized)
 
-        respond_with(@order) { |format| format.html { redirect_to :back } }
+        respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
 
       def finalize_adjustments
@@ -162,7 +162,7 @@ module Spree
         adjustments.each(&:finalize!)
         flash[:success] = Spree.t(:all_adjustments_finalized)
 
-        respond_with(@order) { |format| format.html { redirect_to :back } }
+        respond_with(@order) { |format| format.html { redirect_to(spree.admin_order_adjustments_path(@order)) } }
       end
 
       private

data/app/controllers/spree/admin/resource_controller.rb

@@ -79,7 +79,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
 
     respond_to do |format|
-      format.js { render text: 'Ok' }
+      format.js { render plain: 'Ok' }
     end
   end
 

data/app/controllers/spree/admin/return_authorizations_controller.rb

@@ -10,7 +10,7 @@ module Spree
       def fire
         @return_authorization.send("#{params[:e]}!")
         flash[:success] = Spree.t(:return_authorization_updated)
-        redirect_to :back
+        redirect_back(fallback_location: admin_order_return_authorization(@order))
       end
 
       private

data/app/controllers/spree/admin/return_items_controller.rb

@@ -8,7 +8,8 @@ module Spree
       end
 
       def render_after_update_error
-        redirect_to :back, flash: { error: @object.errors.full_messages.join(', ') }
+        redirect_back(fallback_location: location_after_save,
+                    flash: { error: @object.errors.full_messages.join(', ') })
       end
     end
   end

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -90,7 +90,8 @@ module Spree
         if action == :create
           edit_admin_stock_transfer_path(@stock_transfer)
         else
-          :back
+          # redirect back, or to fallback if referer not provided
+          request.headers["Referer"] || admin_stock_transfers_path
         end
       end
 

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -1,6 +1,6 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
 
-<% admin_breadcrumb("#{Spree.t(:editing_reimbursement)} #{@reimbursement.number}") %>
+<% admin_breadcrumb("#{Spree.t(:editing_reimbursement} #{@reimbursement.number}") %>
 
 
 <% content_for :page_actions do %>

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

@@ -7,7 +7,7 @@ describe Spree::Admin::BaseController, type: :controller do
   controller(Spree::Admin::BaseController) do
     def index
       authorize! :update, Spree::Order
-      render text: 'test'
+      render plain: 'test'
     end
   end
 

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

@@ -4,7 +4,7 @@ describe Spree::Admin::CancellationsController do
   stub_authorization!
 
   describe "#index" do
-    subject { get :index, order_id: order.number }
+    subject { get :index, params: { order_id: order.number } }
 
     let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
 
@@ -18,13 +18,13 @@ describe Spree::Admin::CancellationsController do
   end
 
   describe "#cancel" do
-    subject { post :short_ship, order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) }
+    subject { post :short_ship, params: { order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) } }
 
     let(:order) { create(:order_ready_to_ship, number: "R100", state: "complete", line_items_count: 1) }
     let(:referer) { "order_admin_page" }
 
     context "no inventory unit ids are provided" do
-      subject { post :short_ship, order_id: order.number }
+      subject { post :short_ship, params: { order_id: order.number } }
 
       it "redirects back" do
         subject

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

@@ -10,7 +10,7 @@ module Spree
         let(:customer_return) { create(:customer_return) }
 
         subject do
-          get :index, { order_id: customer_return.order.to_param }
+          get :index, params: { order_id: customer_return.order.to_param }
         end
 
         before { subject }
@@ -31,7 +31,7 @@ module Spree
         let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
 
         subject do
-          get :new, { order_id: order.to_param }
+          get :new, params: { order_id: order.to_param }
         end
 
         it "loads the order" do
@@ -126,7 +126,7 @@ module Spree
         let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
 
         subject do
-          get :edit, { order_id: order.to_param, id: customer_return.to_param }
+          get :edit, params: { order_id: order.to_param, id: customer_return.to_param }
         end
 
         it "loads the order" do
@@ -202,7 +202,7 @@ module Spree
           }
         end
 
-        subject { post :create, customer_return_params }
+        subject { post :create, params: customer_return_params }
 
         it { expect { subject }.to change { Spree::CustomerReturn.count }.by(1) }
         it do

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

@@ -9,7 +9,7 @@ describe Spree::Admin::ProductsController, type: :controller do
 
   # Regression test for GH https://github.com/spree/spree/issues/538
   it "cannot find a non-existent product" do
-    get :edit, id: "non-existent-product"
+    get :edit, params: { id: "non-existent-product" }
     expect(response).to redirect_to(spree.admin_products_path)
     expect(flash[:error]).to eql("Product is not found")
   end

data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb

@@ -15,13 +15,13 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
         expect(order).to receive(:update_attributes) { true }
         expect(order).to receive(:next) { false }
         attributes = { order_id: order.number, order: { email: "" } }
-        put :update, attributes
+        put :update, params: attributes
       end
 
       it "does refresh the shipment rates with all shipping methods" do
         expect(order).to receive(:refresh_shipment_rates)
         attributes = { order_id: order.number, order: { email: "" } }
-        put :update, attributes
+        put :update, params: attributes
       end
 
       # Regression spec
@@ -37,7 +37,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
         end
 
         it 'allows the updating of an email address' do
-          expect { put :update, attributes }.to change { order.reload.email }.to eq 'foo@bar.com'
+          expect { put :update, params: attributes }.to change { order.reload.email }.to eq 'foo@bar.com'
           expect(response).to be_redirect
         end
       end
@@ -53,7 +53,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           }
 
           expect {
-            put :update, attributes
+            put :update, params: attributes
           }.to change{ order.reload.user }.to(assigned_user)
         end
       end
@@ -70,7 +70,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
           }
 
           expect {
-            put :update, attributes
+            put :update, params: attributes
           }.not_to change{ order.reload.user }
         end
       end

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

@@ -37,7 +37,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     context "#approve" do
       it "approves an order" do
         expect(order.contents).to receive(:approve).with(user: controller.try_spree_current_user)
-        put :approve, id: order.number
+        put :approve, params: { id: order.number }
         expect(flash[:success]).to eq Spree.t(:order_approved)
       end
     end
@@ -45,7 +45,7 @@ describe Spree::Admin::OrdersController, type: :controller do
     context "#cancel" do
       it "cancels an order" do
         expect(order).to receive(:canceled_by).with(controller.try_spree_current_user)
-        put :cancel, id: order.number
+        put :cancel, params: { id: order.number }
         expect(flash[:success]).to eq Spree.t(:order_canceled)
       end
     end
@@ -53,14 +53,14 @@ describe Spree::Admin::OrdersController, type: :controller do
     context "#resume" do
       it "resumes an order" do
         expect(order).to receive(:resume!)
-        put :resume, id: order.number
+        put :resume, params: { id: order.number }
         expect(flash[:success]).to eq Spree.t(:order_resumed)
       end
     end
 
     context "pagination" do
       it "can page through the orders" do
-        get :index, page: 2, per_page: 10
+        get :index, params: { page: 2, per_page: 10 }
         expect(assigns[:orders].offset_value).to eq(10)
         expect(assigns[:orders].limit_value).to eq(10)
       end
@@ -91,7 +91,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         expect(Spree::Core::Importer::Order).to receive(:import)
           .with(user, hash_including(store_id: controller.current_store.id))
           .and_return(order)
-        get :new, { user_id: user.id }
+        get :new, params: { user_id: user.id }
       end
 
       context "when a user_id is passed as a parameter" do
@@ -102,7 +102,7 @@ describe Spree::Admin::OrdersController, type: :controller do
           expect(Spree::Core::Importer::Order).to receive(:import)
             .with(user, hash_including(created_by_id: controller.try_spree_current_user.id))
             .and_return(order)
-          get :new, { user_id: user.id }
+          get :new, params: { user_id: user.id }
         end
       end
 
@@ -117,13 +117,13 @@ describe Spree::Admin::OrdersController, type: :controller do
       it "does not refresh rates if the order is completed" do
         allow(order).to receive_messages completed?: true
         expect(order).not_to receive :refresh_shipment_rates
-        get :edit, id: order.number
+        get :edit, params: { id: order.number }
       end
 
       it "does refresh the rates if the order is incomplete" do
         allow(order).to receive_messages completed?: false
         expect(order).to receive :refresh_shipment_rates
-        get :edit, id: order.number
+        get :edit, params: { id: order.number }
       end
 
       context "when order does not have a ship address" do
@@ -135,7 +135,7 @@ describe Spree::Admin::OrdersController, type: :controller do
           before { Spree::Config[:order_bill_address_used] = true }
 
           it "should redirect to the customer details page" do
-            get :edit, id: order.number
+            get :edit, params: { id: order.number }
             expect(response).to redirect_to(spree.edit_admin_order_customer_path(order))
           end
         end
@@ -144,7 +144,7 @@ describe Spree::Admin::OrdersController, type: :controller do
           before { Spree::Config[:order_bill_address_used] = false }
 
           it "should redirect to the customer details page" do
-            get :edit, id: order.number
+            get :edit, params: { id: order.number }
             expect(response).to redirect_to(spree.edit_admin_order_customer_path(order))
           end
         end
@@ -153,7 +153,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     describe '#advance' do
       subject do
-        put :advance, id: order.number
+        put :advance, params: { id: order.number }
       end
 
       context 'when incomplete' do
@@ -199,7 +199,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     context '#confirm' do
       subject do
-        get :confirm, id: order.number
+        get :confirm, params: { id: order.number }
       end
 
       context 'when in confirm' do
@@ -234,7 +234,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     context "#complete" do
       subject do
-        put :complete, id: order.number
+        put :complete, params: { id: order.number }
       end
 
       context 'when successful' do
@@ -288,9 +288,9 @@ describe Spree::Admin::OrdersController, type: :controller do
       end
 
       it "does not display duplicated results" do
-        get :index, q: {
+        get :index, params: { q: {
           line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
-        }
+        } }
         expect(assigns[:orders].map(&:number).count).to eq 1
       end
     end
@@ -300,18 +300,18 @@ describe Spree::Admin::OrdersController, type: :controller do
       let!(:finalized_adjustment) { create(:adjustment, finalized: true, adjustable: order, order: order) }
 
       it "changes all the finalized adjustments to unfinalized" do
-        post :unfinalize_adjustments, id: order.number
+        post :unfinalize_adjustments, params: { id: order.number }
         expect(finalized_adjustment.reload.finalized).to eq(false)
       end
 
       it "sets the flash success message" do
-        post :unfinalize_adjustments, id: order.number
+        post :unfinalize_adjustments, params: { id: order.number }
         expect(flash[:success]).to eql('All adjustments successfully unfinalized!')
       end
 
       it "redirects back" do
-        post :unfinalize_adjustments, id: order.number
-        expect(response).to redirect_to(:back)
+        post :unfinalize_adjustments, params: { id: order.number }
+        expect(response).to redirect_to(spree.admin_order_adjustments_path(order))
       end
     end
 
@@ -320,18 +320,18 @@ describe Spree::Admin::OrdersController, type: :controller do
       let!(:not_finalized_adjustment) { create(:adjustment, finalized: false, adjustable: order, order: order) }
 
       it "changes all the unfinalized adjustments to finalized" do
-        post :finalize_adjustments, id: order.number
+        post :finalize_adjustments, params: { id: order.number }
         expect(not_finalized_adjustment.reload.finalized).to eq(true)
       end
 
       it "sets the flash success message" do
-        post :finalize_adjustments, id: order.number
+        post :finalize_adjustments, params: { id: order.number }
         expect(flash[:success]).to eql('All adjustments successfully finalized!')
       end
 
       it "redirects back" do
-        post :finalize_adjustments, id: order.number
-        expect(response).to redirect_to(:back)
+        post :finalize_adjustments, params: { id: order.number }
+        expect(response).to redirect_to(spree.admin_order_adjustments_path(order))
       end
     end
   end
@@ -389,7 +389,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     it "raise active record not found" do
       expect {
-        get :edit, id: 0
+        get :edit, params: { id: 0 }
       }.to raise_error ActiveRecord::RecordNotFound
     end
   end

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

@@ -18,7 +18,7 @@ module Spree
       # regression test for https://github.com/spree/spree/issues/2094
       it "does not clear password on update" do
         expect(payment_method.preferred_password).to eq("haxme")
-        put :update, id: payment_method.id, payment_method: { type: payment_method.class.to_s, preferred_password: "" }
+        put :update, params: { id: payment_method.id, payment_method: { type: payment_method.class.to_s, preferred_password: "" } }
         expect(response).to redirect_to(spree.edit_admin_payment_method_path(payment_method))
 
         payment_method.reload
@@ -28,13 +28,13 @@ module Spree
 
     context "tries to save invalid payment" do
       it "doesn't break, responds nicely" do
-        post :create, payment_method: { name: "", type: "Spree::Gateway::Bogus" }
+        post :create, params: { payment_method: { name: "", type: "Spree::Gateway::Bogus" } }
       end
     end
 
     it "can create a payment method of a valid type" do
       expect {
-        post :create, payment_method: { name: "Test Method", type: "Spree::Gateway::Bogus" }
+        post :create, params: { payment_method: { name: "Test Method", type: "Spree::Gateway::Bogus" } }
       }.to change(Spree::PaymentMethod, :count).by(1)
 
       expect(response).to be_redirect
@@ -43,7 +43,7 @@ module Spree
 
     it "can not create a payment method of an invalid type" do
       expect {
-        post :create, payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType" }
+        post :create, params: { payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType" } }
       }.to change(Spree::PaymentMethod, :count).by(0)
 
       expect(response).to be_redirect