solidus_backend 1.4.2 → 2.0.0.beta1

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

@@ -32,7 +32,7 @@ module Spree
           end
 
           before do
-            post :create, attributes
+            post :create, params: attributes
           end
 
           it "should process payment correctly" do
@@ -81,7 +81,7 @@ module Spree
           end
 
           it "loads backend payment methods" do
-            get :new, order_id: order.number
+            get :new, params: { order_id: order.number }
             expect(response.status).to eq(200)
             expect(assigns[:payment_methods]).to include(@payment_method)
           end
@@ -97,7 +97,7 @@ module Spree
 
           context "order does not have payments" do
             it "redirect to new payments page" do
-              get :index, { amount: 100, order_id: order.number }
+              get :index, params: { amount: 100, order_id: order.number }
               expect(response).to redirect_to(spree.new_admin_order_payment_path(order))
             end
           end
@@ -108,7 +108,7 @@ module Spree
             end
 
             it "shows the payments page" do
-              get :index, { amount: 100, order_id: order.number }
+              get :index, params: { amount: 100, order_id: order.number }
               expect(response.code).to eq "200"
             end
           end
@@ -121,7 +121,7 @@ module Spree
           end
 
           it "should redirect to the customer details page" do
-            get :index, { amount: 100, order_id: order.number }
+            get :index, params: { amount: 100, order_id: order.number }
             expect(response).to redirect_to(spree.edit_admin_order_customer_path(order))
           end
         end
@@ -147,7 +147,7 @@ module Spree
 
             it 'allows the action' do
               expect {
-                post(:fire, id: payment.to_param, e: 'capture', order_id: order.to_param)
+                post(:fire, params: { id: payment.to_param, e: 'capture', order_id: order.to_param })
               }.to change { payment.reload.state }.from('checkout').to('completed')
             end
 
@@ -166,7 +166,7 @@ module Spree
 
               it 'does not allow the action' do
                 expect {
-                  post(:fire, id: payment.to_param, e: 'capture', order_id: order.to_param)
+                  post(:fire, params: { id: payment.to_param, e: 'capture', order_id: order.to_param })
                 }.to_not change { payment.reload.state }
                 expect(flash[:error]).to eq('Authorization Failure')
               end

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

@@ -9,7 +9,7 @@ describe Spree::Admin::PricesController do
     context "when only given a product" do
       let(:product) { create(:product) }
 
-      subject { get :index, product_id: product.slug }
+      subject { get :index, params: { product_id: product.slug } }
 
       it { is_expected.to be_success }
 
@@ -25,7 +25,7 @@ describe Spree::Admin::PricesController do
       let(:variant) { create(:variant) }
       let(:product) { variant.product }
 
-      subject { get :index, product_id: product.slug, variant_id: variant.id }
+      subject { get :index, params: { product_id: product.slug, variant_id: variant.id } }
 
       it { is_expected.to be_success }
 

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

@@ -6,7 +6,7 @@ module Spree
       stub_authorization!
 
       describe "#index" do
-        subject { get :index, parameters }
+        subject { get :index, params: parameters }
 
         context "no option values are provided" do
           let(:product) { create(:product) }

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

@@ -9,7 +9,7 @@ describe Spree::Admin::ProductsController, type: :controller do
     # Regression test for https://github.com/spree/spree/issues/1259
     it "can find a product by SKU" do
       product = create(:product, sku: "ABC123")
-      get :index, q: { sku_start: "ABC123" }
+      get :index, params: { q: { sku_start: "ABC123" } }
       expect(assigns[:collection]).not_to be_empty
       expect(assigns[:collection]).to include(product)
     end
@@ -19,7 +19,7 @@ describe Spree::Admin::ProductsController, type: :controller do
   context "adding properties to a product" do
     let!(:product) { create(:product) }
     specify do
-      put :update, id: product.to_param, product: { product_properties_attributes: { "1" => { property_name: "Foo", value: "bar" } } }
+      put :update, params: { id: product.to_param, product: { product_properties_attributes: { "1" => { property_name: "Foo", value: "bar" } } } }
       expect(flash[:success]).to eq("Product #{product.name.inspect} has been successfully updated!")
     end
   end
@@ -53,7 +53,7 @@ describe Spree::Admin::ProductsController, type: :controller do
       }
     end
 
-    subject { put :update, payload }
+    subject { put :update, params: payload }
 
     it "creates a variant property rule" do
       expect { subject }.to change { product.variant_property_rules.count }.by(1)
@@ -113,7 +113,7 @@ describe Spree::Admin::ProductsController, type: :controller do
       }
     end
 
-    subject { put :update, payload }
+    subject { put :update, params: payload }
 
     it "does not create any new rules" do
       expect { subject }.to_not change { Spree::VariantPropertyRule.count }
@@ -152,7 +152,7 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
 
     it "deletes all the variants (including master) for the product" do
-      delete :destroy, id: product
+      delete :destroy, params: { id: product }
       expect(product.reload.deleted_at).not_to be_nil
       product.variants_including_master.each do |variant|
         expect(variant.reload.deleted_at).not_to be_nil

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

@@ -6,14 +6,14 @@ describe Spree::Admin::PromotionActionsController, type: :controller do
   let!(:promotion) { create(:promotion) }
 
   it "can create a promotion action of a valid type" do
-    post :create, promotion_id: promotion.id, action_type: "Spree::Promotion::Actions::CreateAdjustment"
+    post :create, params: { promotion_id: promotion.id, action_type: "Spree::Promotion::Actions::CreateAdjustment" }
     expect(response).to be_redirect
     expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
     expect(promotion.actions.count).to eq(1)
   end
 
   it "can not create a promotion action of an invalid type" do
-    post :create, promotion_id: promotion.id, action_type: "Spree::InvalidType"
+    post :create, params: { promotion_id: promotion.id, action_type: "Spree::InvalidType" }
     expect(response).to be_redirect
     expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
     expect(promotion.rules.count).to eq(0)

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

@@ -10,7 +10,7 @@ describe Spree::Admin::PromotionCodesController do
   let!(:code3) { create(:promotion_code, promotion: promotion) }
 
   it "can create a promotion rule of a valid type" do
-    get :index, promotion_id: promotion.id, format: 'csv'
+    get :index, params: { promotion_id: promotion.id, format: 'csv' }
     expect(response).to be_success
     parsed = CSV.parse(response.body, headers: true)
     expect(parsed.entries.map(&:to_h)).to eq([{ "Code" => code1.value }, { "Code" => code2.value }, { "Code" => code3.value }])

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

@@ -6,14 +6,14 @@ describe Spree::Admin::PromotionRulesController, type: :controller do
   let!(:promotion) { create(:promotion) }
 
   it "can create a promotion rule of a valid type" do
-    post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" }
+    post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" } }
     expect(response).to be_redirect
     expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
     expect(promotion.rules.count).to eq(1)
   end
 
   it "can not create a promotion rule of an invalid type" do
-    post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" }
+    post :create, params: { promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" } }
     expect(response).to be_redirect
     expect(response).to redirect_to spree.edit_admin_promotion_path(promotion)
     expect(promotion.rules.count).to eq(0)

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

@@ -20,29 +20,29 @@ describe Spree::Admin::PromotionsController, type: :controller do
 
     context "search" do
       it "pages results" do
-        get :index, per_page: '1'
+        get :index, params: { per_page: '1' }
         expect(assigns[:promotions]).to eq [promotion2]
       end
 
       it "filters by name" do
-        get :index, q: { name_cont: promotion1.name }
+        get :index, params: { q: { name_cont: promotion1.name } }
         expect(assigns[:promotions]).to eq [promotion1]
       end
 
       it "filters by code" do
-        get :index, q: { codes_value_cont: promotion1.codes.first.value }
+        get :index, params: { q: { codes_value_cont: promotion1.codes.first.value } }
         expect(assigns[:promotions]).to eq [promotion1]
       end
 
       it "filters by path" do
-        get :index, q: { path_cont: promotion1.path }
+        get :index, params: { q: { path_cont: promotion1.path } }
         expect(assigns[:promotions]).to eq [promotion1]
       end
     end
   end
 
   describe "#create" do
-    subject { post :create, params }
+    subject { post :create, params: params }
     let(:params) { { promotion: { name: 'some promo' } } }
 
     context "it succeeds" do

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

@@ -9,9 +9,11 @@ describe Spree::Admin::RefundsController do
 
       subject do
         post :create,
-                   refund: { amount: "50.0", refund_reason_id: "1" },
-                   order_id: payment.order_id,
-                   payment_id: payment.id
+          params: {
+          refund: { amount: "50.0", refund_reason_id: "1" },
+          order_id: payment.order_id,
+          payment_id: payment.id
+        }
       end
 
       before(:each) do

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

@@ -14,7 +14,7 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
     let!(:inactive_stock_location) { create(:stock_location, active: false) }
 
     subject do
-      get :edit, order_id: order.to_param, id: reimbursement.to_param
+      get :edit, params: { order_id: order.to_param, id: reimbursement.to_param }
     end
 
     it "loads all the active stock locations" do
@@ -32,7 +32,7 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
     before { return_item.receive! }
 
     subject do
-      post :create, order_id: order.to_param, build_from_customer_return_id: customer_return.id
+      post :create, params: { order_id: order.to_param, build_from_customer_return_id: customer_return.id }
     end
 
     it 'creates the reimbursement' do
@@ -59,7 +59,7 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
         it 'redirects to the referer' do
           request.env["HTTP_REFERER"] = referer
           expect {
-            post :create, order_id: order.to_param
+            post :create, params: { order_id: order.to_param }
           }.to_not change { Spree::Reimbursement.count }
           expect(response).to redirect_to(referer)
           expect(flash[:error]).to eq("something bad happened")
@@ -69,7 +69,7 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
       context 'when a referer header is not present' do
         it 'redirects to the admin root' do
           expect {
-            post :create, order_id: order.to_param
+            post :create, params: { order_id: order.to_param }
           }.to_not change { Spree::Reimbursement.count }
           expect(response).to redirect_to(spree.admin_path)
           expect(flash[:error]).to eq("something bad happened")
@@ -86,7 +86,7 @@ describe Spree::Admin::ReimbursementsController, type: :controller do
     let(:payment) { order.payments.first }
 
     subject do
-      post :perform, order_id: order.to_param, id: reimbursement.to_param
+      post :perform, params: { order_id: order.to_param, id: reimbursement.to_param }
     end
 
     it 'redirects to customer return page' do

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

@@ -44,7 +44,7 @@ describe Spree::Admin::ReportsController, type: :controller do
       order_complete_mid_month.save!
     end
 
-    subject { get :sales_total, params }
+    subject { get :sales_total, params: params }
 
     shared_examples 'sales total report' do
       it 'should respond with success' do

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

@@ -58,7 +58,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
     let(:widget) { Widget.create!(name: 'a widget') }
 
     subject do
-      get :edit, id: widget.to_param
+      get :edit, params: { id: widget.to_param }
     end
 
     it 'succeeds' do
@@ -72,7 +72,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
       { widget: { name: 'a widget' } }
     end
 
-    subject { post :create, params }
+    subject { post :create, params: params }
 
     it 'creates the resource' do
       expect { subject }.to change { Widget.count }.by(1)
@@ -112,7 +112,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
       }
     end
 
-    subject { put :update, params }
+    subject { put :update, params: params }
 
     it 'updates the resource' do
       expect { subject }.to change { widget.reload.name }.from('a widget').to('widget renamed')
@@ -138,7 +138,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
     let(:params) { { id: widget.id } }
 
     subject {
-      delete :destroy, params
+      delete :destroy, params: params
     }
 
     it 'destroys the resource' do
@@ -151,8 +151,8 @@ describe Spree::Admin::WidgetsController, type: :controller do
     let(:widget_2) { Widget.create!(name: 'widget 2', position: 2) }
 
     subject do
-      post :update_positions, id: widget_1.to_param,
-        positions: { widget_1.id => '2', widget_2.id => '1' }, format: 'js'
+      post :update_positions, params: { id: widget_1.to_param,
+        positions: { widget_1.id => '2', widget_2.id => '1' }, format: 'js' }
     end
 
     it 'updates the position of widget 1' do

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

@@ -19,7 +19,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
       let(:return_authorization) { return_item.return_authorization }
 
       it "loads all the active rma reasons" do
-        get :edit, id: return_authorization.to_param, order_id: return_authorization.order.to_param
+        get :edit, params: { id: return_authorization.to_param, order_id: return_authorization.order.to_param }
         expect(assigns(:reasons)).to include(return_reason)
         expect(assigns(:reasons)).to include(inactive_rma_reason)
         expect(assigns(:reasons)).not_to include(other_inactive_rma_reason)
@@ -30,14 +30,14 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
       let(:return_authorization) { create(:return_authorization, reason: return_reason) }
 
       it "loads all the active rma reasons" do
-        get :edit, id: return_authorization.to_param, order_id: return_authorization.order.to_param
+        get :edit, params: { id: return_authorization.to_param, order_id: return_authorization.order.to_param }
         expect(assigns(:reasons)).to eq [return_reason]
       end
     end
 
     context "return authorization doesn't have an associated reason" do
       it "loads all the active rma reasons" do
-        get :new, order_id: order.to_param
+        get :new, params: { order_id: order.to_param }
         expect(assigns(:reasons)).to eq [return_reason]
       end
     end
@@ -68,14 +68,14 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
     end
 
     context '#new' do
-      subject { get :new, order_id: order.to_param }
+      subject { get :new, params: { order_id: order.to_param } }
 
       include_context 'without existing return items'
     end
 
     context '#edit' do
       subject do
-        get :edit, {
+        get :edit, params: {
           id: return_authorization.to_param,
           order_id: order.to_param
         }
@@ -89,7 +89,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
 
     context '#create failed' do
       subject do
-        post :create, {
+        post :create, params: {
           return_authorization: { stock_location_id: nil }, # return authorization requires valid stock location, so this will fail
           order_id: order.to_param
         }
@@ -100,7 +100,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
 
     context '#update failed' do
       subject do
-        put :update, {
+        put :update, params: {
           return_authorization: { stock_location_id: nil }, # return authorization requires valid stock location, so this will fail
           id: return_authorization.to_param,
           order_id: order.to_param
@@ -121,7 +121,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
     let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
 
     before do
-      get :new, order_id: order.to_param
+      get :new, params: { order_id: order.to_param }
     end
 
     it "loads all the active reimbursement types" do
@@ -136,7 +136,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
     let!(:inactive_stock_location) { create(:stock_location, active: false) }
 
     before do
-      get :new, order_id: order.to_param
+      get :new, params: { order_id: order.to_param }
     end
 
     it "loads all the active stock locations" do
@@ -148,7 +148,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
   context '#create' do
     let(:stock_location) { create(:stock_location) }
 
-    subject { post :create, params }
+    subject { post :create, params: params }
 
     let(:params) do
       {
@@ -188,7 +188,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
       }
     end
 
-    subject { put :update, params }
+    subject { put :update, params: params }
 
     context "adding an item" do
       let(:return_items_params) do

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

@@ -10,7 +10,7 @@ describe Spree::Admin::ReturnItemsController, type: :controller do
     let(:new_acceptance_status) { 'rejected' }
 
     subject do
-      put :update, id: return_item.to_param, return_item: { acceptance_status: new_acceptance_status }
+      put :update, params: { id: return_item.to_param, return_item: { acceptance_status: new_acceptance_status } }
     end
 
     it 'updates the return item' do

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

@@ -13,7 +13,7 @@ describe Spree::Admin::SearchController, type: :controller do
   end
 
   describe 'GET #users' do
-    subject { get :users, { format: :json }.merge(params) }
+    subject { get :users, params: { format: :json }.merge(params) }
 
     shared_examples_for 'user found by search' do
       it "should include users matching query" do
@@ -66,7 +66,7 @@ describe Spree::Admin::SearchController, type: :controller do
     let!(:product_one) { create(:product, name: 'jersey') }
     let!(:product_two) { create(:product, name: 'better jersey') }
 
-    subject { get :products, params }
+    subject { get :products, params: params }
 
     shared_examples_for 'product search' do
       it 'should respond with http success' do