solidus_backend 1.3.2 → 1.4.0.beta1

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)
-        spree_put :approve, id: order.number
+        put :approve, 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)
-        spree_put :cancel, id: order.number
+        put :cancel, 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!)
-        spree_put :resume, id: order.number
+        put :resume, id: order.number
         expect(flash[:success]).to eq Spree.t(:order_resumed)
       end
     end
 
     context "pagination" do
       it "can page through the orders" do
-        spree_get :index, page: 2, per_page: 10
+        get :index, page: 2, per_page: 10
         expect(assigns[:orders].offset_value).to eq(10)
         expect(assigns[:orders].limit_value).to eq(10)
       end
@@ -77,21 +77,21 @@ describe Spree::Admin::OrdersController, type: :controller do
         expect(Spree::Core::Importer::Order).to receive(:import)
           .with(nil, hash_including(created_by_id: controller.try_spree_current_user.id))
           .and_return(order)
-        spree_get :new
+        get :new
       end
 
       it "sets frontend_viewable to false" do
         expect(Spree::Core::Importer::Order).to receive(:import)
           .with(nil, hash_including(frontend_viewable: false ))
           .and_return(order)
-        spree_get :new
+        get :new
       end
 
       it "should associate the order with a store" do
         expect(Spree::Core::Importer::Order).to receive(:import)
           .with(user, hash_including(store_id: controller.current_store.id))
           .and_return(order)
-        spree_get :new, { user_id: user.id }
+        get :new, { user_id: user.id }
       end
 
       context "when a user_id is passed as a parameter" do
@@ -102,12 +102,12 @@ 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)
-          spree_get :new, { user_id: user.id }
+          get :new, { user_id: user.id }
         end
       end
 
       it "should redirect to cart" do
-        spree_get :new
+        get :new
         expect(response).to redirect_to(spree.cart_admin_order_path(Spree::Order.last))
       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
-        spree_get :edit, id: order.number
+        get :edit, 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
-        spree_get :edit, id: order.number
+        get :edit, 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
-            spree_get :edit, id: order.number
+            get :edit, 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
-            spree_get :edit, id: order.number
+            get :edit, 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
-        spree_put :advance, id: order.number
+        put :advance, id: order.number
       end
 
       context 'when incomplete' do
@@ -199,7 +199,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     context '#confirm' do
       subject do
-        spree_get :confirm, id: order.number
+        get :confirm, 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
-        spree_put :complete, id: order.number
+        put :complete, id: order.number
       end
 
       context 'when successful' do
@@ -288,7 +288,7 @@ describe Spree::Admin::OrdersController, type: :controller do
       end
 
       it "does not display duplicated results" do
-        spree_get :index, q: {
+        get :index, q: {
           line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
         }
         expect(assigns[:orders].map(&:number).count).to eq 1
@@ -300,17 +300,17 @@ 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
-        spree_post :unfinalize_adjustments, id: order.number
+        post :unfinalize_adjustments, id: order.number
         expect(finalized_adjustment.reload.finalized).to eq(false)
       end
 
       it "sets the flash success message" do
-        spree_post :unfinalize_adjustments, id: order.number
+        post :unfinalize_adjustments, id: order.number
         expect(flash[:success]).to eql('All adjustments successfully unfinalized!')
       end
 
       it "redirects back" do
-        spree_post :unfinalize_adjustments, id: order.number
+        post :unfinalize_adjustments, id: order.number
         expect(response).to redirect_to(:back)
       end
     end
@@ -320,17 +320,17 @@ 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
-        spree_post :finalize_adjustments, id: order.number
+        post :finalize_adjustments, id: order.number
         expect(not_finalized_adjustment.reload.finalized).to eq(true)
       end
 
       it "sets the flash success message" do
-        spree_post :finalize_adjustments, id: order.number
+        post :finalize_adjustments, id: order.number
         expect(flash[:success]).to eql('All adjustments successfully finalized!')
       end
 
       it "redirects back" do
-        spree_post :finalize_adjustments, id: order.number
+        post :finalize_adjustments, id: order.number
         expect(response).to redirect_to(:back)
       end
     end
@@ -346,21 +346,21 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     it 'should grant access to users with an admin role' do
       user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
-      spree_get :index
+      get :index
       expect(response).to render_template :index
     end
 
     it 'should grant access to users with an bar role' do
       user.spree_roles << Spree::Role.find_or_create_by(name: 'bar')
       Spree::Ability.register_ability(BarAbility)
-      spree_get :index
+      get :index
       expect(response).to render_template :index
       Spree::Ability.remove_ability(BarAbility)
     end
 
     it 'should deny access to users without an admin role' do
       allow(user).to receive_messages has_spree_role?: false
-      spree_get :index
+      get :index
       expect(response).to redirect_to('/unauthorized')
     end
 
@@ -376,7 +376,7 @@ describe Spree::Admin::OrdersController, type: :controller do
         expect(Spree::Order.complete.count).to eq 4
 
         allow(user).to receive_messages has_spree_role?: false
-        spree_get :index
+        get :index
         expect(response).to render_template :index
         expect(assigns['orders'].size).to eq 1
         expect(assigns['orders'].first.number).to eq number
@@ -389,7 +389,7 @@ describe Spree::Admin::OrdersController, type: :controller do
 
     it "raise active record not found" do
       expect {
-        spree_get :edit, id: 0
+        get :edit, 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")
-        spree_put :update, id: payment_method.id, payment_method: { type: payment_method.class.to_s, preferred_password: "" }
+        put :update, 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
-        spree_post :create, payment_method: { name: "", type: "Spree::Gateway::Bogus" }
+        post :create, payment_method: { name: "", type: "Spree::Gateway::Bogus" }
       end
     end
 
     it "can create a payment method of a valid type" do
       expect {
-        spree_post :create, payment_method: { name: "Test Method", type: "Spree::Gateway::Bogus" }
+        post :create, 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 {
-        spree_post :create, payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType" }
+        post :create, payment_method: { name: "Invalid Payment Method", type: "Spree::InvalidType" }
       }.to change(Spree::PaymentMethod, :count).by(0)
 
       expect(response).to be_redirect
@@ -51,7 +51,7 @@ module Spree
     end
 
     describe "GET index" do
-      subject { spree_get :index }
+      subject { get :index }
 
       let!(:first_method) { GatewayWithPassword.create! name: "First", preferred_password: "1235" }
       let!(:second_method) { GatewayWithPassword.create! name: "Second", preferred_password: "1235" }

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

@@ -32,7 +32,7 @@ module Spree
           end
 
           before do
-            spree_post :create, attributes
+            post :create, attributes
           end
 
           it "should process payment correctly" do
@@ -81,7 +81,7 @@ module Spree
           end
 
           it "loads backend payment methods" do
-            spree_get :new, order_id: order.number
+            get :new, 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
-              spree_get :index, { amount: 100, order_id: order.number }
+              get :index, { 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
-              spree_get :index, { amount: 100, order_id: order.number }
+              get :index, { 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
-            spree_get :index, { amount: 100, order_id: order.number }
+            get :index, { 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 {
-                spree_post(:fire, id: payment.to_param, e: 'capture', order_id: order.to_param)
+                post(:fire, 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 {
-                  spree_post(:fire, id: payment.to_param, e: 'capture', order_id: order.to_param)
+                  post(:fire, 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 { spree_get :index, product_id: product.slug }
+      subject { get :index, 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 { spree_get :index, product_id: product.slug, variant_id: variant.id }
+      subject { get :index, 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 { spree_get :index, parameters }
+        subject { get :index, 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")
-      spree_get :index, q: { sku_start: "ABC123" }
+      get :index, 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
-      spree_put :update, id: product.to_param, product: { product_properties_attributes: { "1" => { property_name: "Foo", value: "bar" } } }
+      put :update, 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 { spree_put :update, payload }
+    subject { put :update, payload }
 
     it "creates a variant property rule" do
       expect { subject }.to change { product.variant_property_rules.count }.by(1)
@@ -113,14 +113,14 @@ describe Spree::Admin::ProductsController, type: :controller do
       }
     end
 
-    subject { spree_put :update, payload }
+    subject { put :update, payload }
 
     it "does not create any new rules" do
       expect { subject }.to_not change { Spree::VariantPropertyRule.count }
     end
 
     it "replaces the rule's condition" do
-      expect { subject }.to change { rule.option_value_ids }.from([original_option_value.id]).to([option_value.id])
+      expect { subject }.to change { rule.reload.option_value_ids }.from([original_option_value.id]).to([option_value.id])
     end
 
     it "adds two values to the rule" do
@@ -152,7 +152,7 @@ describe Spree::Admin::ProductsController, type: :controller do
     end
 
     it "deletes all the variants (including master) for the product" do
-      spree_delete :destroy, id: product
+      delete :destroy, 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
-    spree_post :create, promotion_id: promotion.id, action_type: "Spree::Promotion::Actions::CreateAdjustment"
+    post :create, 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
-    spree_post :create, promotion_id: promotion.id, action_type: "Spree::InvalidType"
+    post :create, 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
-    spree_get :index, promotion_id: promotion.id, format: 'csv'
+    get :index, 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
-    spree_post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::Promotion::Rules::Product" }
+    post :create, 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
-    spree_post :create, promotion_id: promotion.id, promotion_rule: { type: "Spree::InvalidType" }
+    post :create, 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)