solidus_backend 1.3.2 → 1.4.0.beta1

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

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

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

@@ -8,7 +8,7 @@ describe Spree::Admin::RefundsController do
       let(:payment) { create(:payment) }
 
       subject do
-        spree_post :create,
+        post :create,
                    refund: { amount: "50.0", refund_reason_id: "1" },
                    order_id: payment.order_id,
                    payment_id: payment.id

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
-      spree_get :edit, order_id: order.to_param, id: reimbursement.to_param
+      get :edit, 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
-      spree_post :create, order_id: order.to_param, build_from_customer_return_id: customer_return.id
+      post :create, 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 {
-            spree_post :create, order_id: order.to_param
+            post :create, 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 {
-            spree_post :create, order_id: order.to_param
+            post :create, 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
-      spree_post :perform, order_id: order.to_param, id: reimbursement.to_param
+      post :perform, 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 { spree_get :sales_total, params }
+    subject { get :sales_total, params }
 
     shared_examples 'sales total report' do
       it 'should respond with success' do
@@ -126,7 +126,7 @@ describe Spree::Admin::ReportsController, type: :controller do
 
   describe 'GET index' do
     it 'should be ok' do
-      spree_get :index
+      get :index
       expect(response).to be_ok
     end
   end

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

@@ -45,7 +45,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
 
   describe '#new' do
     subject do
-      spree_get :new
+      get :new
     end
 
     it 'succeeds' do
@@ -58,7 +58,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
     let(:widget) { Widget.create!(name: 'a widget') }
 
     subject do
-      spree_get :edit, id: widget.to_param
+      get :edit, 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 { spree_post :create, params }
+    subject { post :create, 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 { spree_put :update, params }
+    subject { put :update, 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 {
-      spree_delete :destroy, params
+      delete :destroy, params
     }
 
     it 'destroys the resource' do
@@ -151,7 +151,7 @@ describe Spree::Admin::WidgetsController, type: :controller do
     let(:widget_2) { Widget.create!(name: 'widget 2', position: 2) }
 
     subject do
-      spree_post :update_positions, id: widget_1.to_param,
+      post :update_positions, id: widget_1.to_param,
         positions: { widget_1.id => '2', widget_2.id => '1' }, format: 'js'
     end
 

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
-        spree_get :edit, id: return_authorization.to_param, order_id: return_authorization.order.to_param
+        get :edit, 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
-        spree_get :edit, id: return_authorization.to_param, order_id: return_authorization.order.to_param
+        get :edit, 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
-        spree_get :new, order_id: order.to_param
+        get :new, 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 { spree_get :new, order_id: order.to_param }
+      subject { get :new, order_id: order.to_param }
 
       include_context 'without existing return items'
     end
 
     context '#edit' do
       subject do
-        spree_get :edit, {
+        get :edit, {
           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
-        spree_post :create, {
+        post :create, {
           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
-        spree_put :update, {
+        put :update, {
           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
-      spree_get :new, order_id: order.to_param
+      get :new, 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
-      spree_get :new, order_id: order.to_param
+      get :new, 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 { spree_post :create, params }
+    subject { post :create, params }
 
     let(:params) do
       {
@@ -188,7 +188,7 @@ describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
       }
     end
 
-    subject { spree_put :update, params }
+    subject { put :update, 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
-      spree_put :update, id: return_item.to_param, return_item: { acceptance_status: new_acceptance_status }
+      put :update, 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 { spree_xhr_get :users, params }
+    subject { get :users, { 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 { spree_get :products, params }
+    subject { get :products, params }
 
     shared_examples_for 'product search' do
       it 'should respond with http success' do

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

@@ -8,7 +8,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do
     shipping_method = stub_model(Spree::ShippingMethod)
     allow(Spree::ShippingMethod).to receive_messages find: shipping_method
     expect(shipping_method.deleted_at).to be_nil
-    spree_delete :destroy, id: 1
+    delete :destroy, id: 1
     expect(shipping_method.reload.deleted_at).not_to be_nil
   end
 end

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

@@ -15,7 +15,7 @@ module Spree
         before { request.env["HTTP_REFERER"] = "product_admin_page" }
 
         subject do
-          spree_post :create, { variant_id: variant, stock_location_id: stock_location, stock_movement: { quantity: 1, stock_item_id: stock_item.id } }
+          post :create, { variant_id: variant, stock_location_id: stock_location, stock_movement: { quantity: 1, stock_item_id: stock_item.id } }
         end
 
         it "creates a stock movement with originator" do
@@ -31,7 +31,7 @@ module Spree
 
         context "with product_slug param" do
           it "scopes the variants by the product" do
-            spree_get :index, product_slug: variant_1.product.slug
+            get :index, product_slug: variant_1.product.slug
             expect(assigns(:variants)).to include variant_1
             expect(assigns(:variants)).not_to include variant_2
           end
@@ -39,7 +39,7 @@ module Spree
 
         context "without product_slug params" do
           it "allows all accessible variants to be returned" do
-            spree_get :index
+            get :index
             expect(assigns(:variants)).to include variant_1
             expect(assigns(:variants)).to include variant_2
           end

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

@@ -8,7 +8,7 @@ module Spree
       # Regression for https://github.com/spree/spree/issues/4272
       context "with no countries present" do
         it "cannot create a new stock location" do
-          spree_get :new
+          get :new
           expect(flash[:error]).to eq(Spree.t(:stock_locations_need_a_default_country))
           expect(response).to redirect_to(spree.admin_stock_locations_path)
         end
@@ -22,7 +22,7 @@ module Spree
         end
 
         it "can create a new stock location" do
-          spree_get :new
+          get :new
           expect(response).to be_success
         end
       end
@@ -33,7 +33,7 @@ module Spree
         end
 
         it "can create a new stock location" do
-          spree_get :new
+          get :new
           expect(response).to be_success
         end
       end

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

@@ -40,24 +40,24 @@ module Spree
         end
 
         it "doesn't display stock locations the user doesn't have access to" do
-          spree_get :index
+          get :index
           expect(assigns(:stock_locations)).to match_array [warehouse, ny_store, la_store]
         end
       end
 
       it "searches by stock location" do
-        spree_get :index, q: { source_location_id_or_destination_location_id_eq: ny_store.id }
+        get :index, q: { source_location_id_or_destination_location_id_eq: ny_store.id }
         expect(assigns(:stock_transfers).count).to eq 1
         expect(assigns(:stock_transfers)).to include(stock_transfer1)
       end
 
       it "filters the closed stock transfers" do
-        spree_get :index, q: { closed_at_null: '1' }
+        get :index, q: { closed_at_null: '1' }
         expect(assigns(:stock_transfers)).to match_array [stock_transfer1]
       end
 
       it "doesn't filter any stock transfers" do
-        spree_get :index, q: { closed_at_null: '0' }
+        get :index, q: { closed_at_null: '0' }
         expect(assigns(:stock_transfers)).to match_array [stock_transfer1, stock_transfer2]
       end
     end
@@ -66,7 +66,7 @@ module Spree
       let(:warehouse) { StockLocation.create(name: "Warehouse", active: false) }
 
       subject do
-        spree_post :create, stock_transfer: { source_location_id: warehouse.id, description: nil }
+        post :create, stock_transfer: { source_location_id: warehouse.id, description: nil }
       end
 
       context "user doesn't have read access to the selected stock location" do
@@ -101,7 +101,7 @@ module Spree
       # Regression spec for Solidus issue #1087
       context "missing source_stock_location parameter" do
         subject do
-          spree_post :create, stock_transfer: { source_location_id: nil, description: nil }
+          post :create, stock_transfer: { source_location_id: nil, description: nil }
         end
 
         it "sets a flash error" do
@@ -118,7 +118,7 @@ module Spree
       let(:parameters)           { { id: transfer_with_items.to_param } }
 
       subject do
-        spree_get :receive, parameters
+        get :receive, parameters
       end
 
       context 'stock transfer is not receivable' do
@@ -171,7 +171,7 @@ module Spree
       end
 
       subject do
-        spree_put :finalize, id: transfer_with_items.to_param
+        put :finalize, id: transfer_with_items.to_param
       end
 
       context 'stock transfer is not finalizable' do
@@ -229,7 +229,7 @@ module Spree
       end
 
       subject do
-        spree_put :close, id: transfer_with_items.to_param
+        put :close, id: transfer_with_items.to_param
       end
 
       context 'stock transfer is not receivable' do
@@ -321,7 +321,7 @@ module Spree
       let(:warehouse_stock_item) { warehouse.stock_items.find_by(variant: transfer_variant) }
       let(:ny_stock_item) { ny_store.stock_items.find_by(variant: transfer_variant) }
 
-      subject { spree_put :ship, id: stock_transfer.number }
+      subject { put :ship, id: stock_transfer.number }
 
       before do
         warehouse_stock_item.set_count_on_hand(1)

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

@@ -20,7 +20,7 @@ describe Spree::Admin::StoreCreditsController do
     let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
     let!(:event)        { create(:store_credit_auth_event, store_credit: store_credit, created_at: 5.days.ago) }
 
-    before { spree_get :show, user_id: user.id, id: store_credit.id }
+    before { get :show, user_id: user.id, id: store_credit.id }
 
     it "sets the store_credit variable to a new store credit model" do
       expect(assigns(:store_credit)).to eq store_credit
@@ -33,12 +33,12 @@ describe Spree::Admin::StoreCreditsController do
   end
 
   describe "#new" do
-    before { spree_get :new, user_id: create(:user).id }
+    before { get :new, user_id: create(:user).id }
     it { expect(assigns(:credit_categories)).to eq [a_credit_category, b_credit_category] }
   end
 
   describe "#create" do
-    subject { spree_post :create, parameters }
+    subject { post :create, parameters }
 
     before  {
       allow(controller).to receive_messages(try_spree_current_user: admin_user)
@@ -94,7 +94,7 @@ describe Spree::Admin::StoreCreditsController do
   describe "#edit_amount" do
     let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
 
-    before { spree_get :edit_amount, user_id: user.id, id: store_credit.id }
+    before { get :edit_amount, user_id: user.id, id: store_credit.id }
 
     it_behaves_like "update reason loader"
 
@@ -106,7 +106,7 @@ describe Spree::Admin::StoreCreditsController do
   describe "#edit_validity" do
     let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
 
-    before { spree_get :edit_validity, user_id: user.id, id: store_credit.id }
+    before { get :edit_validity, user_id: user.id, id: store_credit.id }
 
     it_behaves_like "update reason loader"
 
@@ -119,7 +119,7 @@ describe Spree::Admin::StoreCreditsController do
     let(:memo)          { "New memo" }
     let!(:store_credit) { create(:store_credit, user: user) }
 
-    subject { spree_put :update, parameters.merge(format: :json) }
+    subject { put :update, parameters.merge(format: :json) }
 
     before  { allow(controller).to receive_messages(try_spree_current_user: admin_user) }
 
@@ -141,7 +141,7 @@ describe Spree::Admin::StoreCreditsController do
       it "returns a success message" do
         subject
         expect(response).to have_http_status(:ok)
-        expect(JSON.parse(response.body)['message']).to match("Store credit has been successfully updated!")
+        expect(JSON.parse(response.body)['message']).to match("Store Credit has been successfully updated!")
       end
     end
 
@@ -182,7 +182,7 @@ describe Spree::Admin::StoreCreditsController do
       }
     end
 
-    subject { spree_put :update_amount, parameters }
+    subject { put :update_amount, parameters }
 
     before  { allow(controller).to receive_messages(try_spree_current_user: admin_user) }
 
@@ -226,7 +226,7 @@ describe Spree::Admin::StoreCreditsController do
       context "the store credit has not been used" do
         it "sets a success message in the flash" do
           subject
-          expect(flash.now[:success]).to match "Store credit has been successfully updated!"
+          expect(flash.now[:success]).to match "Store Credit has been successfully updated!"
         end
 
         it "does not create a new store credit" do
@@ -272,7 +272,7 @@ describe Spree::Admin::StoreCreditsController do
       }
     end
 
-    subject { spree_put :invalidate, parameters }
+    subject { put :invalidate, parameters }
 
     it "attempts to invalidate the store credit" do
       expect { subject }.to change { store_credit.reload.invalidated_at }.from(nil)