solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Spree::Admin::ProductsController, :type => :controller do
+describe Spree::Admin::ProductsController, type: :controller do
   stub_authorization!
 
   context "#index" do
-    let(:ability_user) { stub_model(Spree::LegacyUser, :has_spree_role? => true) }
+    let(:ability_user) { stub_model(Spree::LegacyUser, has_spree_role?: true) }
 
     # 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" }
+      product = create(:product, sku: "ABC123")
+      spree_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" } } }
+      spree_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
@@ -147,12 +147,12 @@ describe Spree::Admin::ProductsController, :type => :controller do
   context "destroying a product" do
     let(:product) do
       product = create(:product)
-      create(:variant, :product => product)
+      create(:variant, product: product)
       product
     end
 
     it "deletes all the variants (including master) for the product" do
-      spree_delete :destroy, :id => product
+      spree_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

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-describe Spree::Admin::PromotionActionsController, :type => :controller do
+describe Spree::Admin::PromotionActionsController, type: :controller do
   stub_authorization!
 
   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"
+    spree_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"
+    spree_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

@@ -13,6 +13,6 @@ describe Spree::Admin::PromotionCodesController do
     spree_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}])
+    expect(parsed.entries.map(&:to_h)).to eq([{ "Code" => code1.value }, { "Code" => code2.value }, { "Code" => code3.value }])
   end
 end

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

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
-describe Spree::Admin::PromotionRulesController, :type => :controller do
+describe Spree::Admin::PromotionRulesController, type: :controller do
   stub_authorization!
 
   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" }
+    spree_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" }
+    spree_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)

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::PromotionsController, :type => :controller do
+describe Spree::Admin::PromotionsController, type: :controller do
   stub_authorization!
 
   let!(:promotion1) { create(:promotion, name: "name1", code: "code1", path: "path1") }
@@ -8,7 +8,6 @@ describe Spree::Admin::PromotionsController, :type => :controller do
   let!(:category) { create :promotion_category }
 
   describe "#index" do
-
     it "succeeds" do
       spree_get :index
       expect(assigns[:promotions]).to match_array [promotion2, promotion1]
@@ -26,17 +25,17 @@ describe Spree::Admin::PromotionsController, :type => :controller do
       end
 
       it "filters by name" do
-        spree_get :index, q: {name_cont: promotion1.name}
+        spree_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 }
+        spree_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}
+        spree_get :index, q: { path_cont: promotion1.path }
         expect(assigns[:promotions]).to eq [promotion1]
       end
     end
@@ -44,7 +43,7 @@ describe Spree::Admin::PromotionsController, :type => :controller do
 
   describe "#create" do
     subject { spree_post :create, params }
-    let(:params) { {promotion: {name: 'some promo'}} }
+    let(:params) { { promotion: { name: 'some promo' } } }
 
     context "it succeeds" do
       it "creates a promotion" do
@@ -73,7 +72,7 @@ describe Spree::Admin::PromotionsController, :type => :controller do
             }.to change { Spree::Promotion.count }.by(1)
           }.to change { Spree::PromotionCode.count }.by(1)
 
-          expect(assigns(:promotion).codes.first.value).to eq ('abc')
+          expect(assigns(:promotion).codes.first.value).to eq 'abc'
         end
       end
 
@@ -116,7 +115,5 @@ describe Spree::Admin::PromotionsController, :type => :controller do
         expect(response).to render_template :new
       end
     end
-
   end
-
 end

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

@@ -5,7 +5,6 @@ describe Spree::Admin::RefundsController do
 
   describe "POST create" do
     context "a Spree::Core::GatewayError is raised" do
-
       let(:payment) { create(:payment) }
 
       subject do

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::ReimbursementsController, :type => :controller do
+describe Spree::Admin::ReimbursementsController, type: :controller do
   stub_authorization!
 
   let!(:default_refund_reason) do
@@ -25,7 +25,7 @@ describe Spree::Admin::ReimbursementsController, :type => :controller do
   end
 
   describe '#create' do
-    let(:customer_return)  { create(:customer_return, line_items_count: 1) }
+    let(:customer_return) { create(:customer_return, line_items_count: 1) }
     let(:order) { customer_return.order }
     let(:return_item) { customer_return.return_items.first }
     let(:payment) { order.payments.first }
@@ -47,7 +47,7 @@ describe Spree::Admin::ReimbursementsController, :type => :controller do
 
     context 'when create fails' do
       before do
-        allow_any_instance_of(Spree::Reimbursement).to receive(:valid?) do |reimbursement, *args|
+        allow_any_instance_of(Spree::Reimbursement).to receive(:valid?) do |reimbursement, *_args|
           reimbursement.errors.add(:base, 'something bad happened')
           false
         end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::ReportsController, :type => :controller do
+describe Spree::Admin::ReportsController, type: :controller do
   stub_authorization!
 
   describe 'ReportsController.available_reports' do
@@ -11,20 +11,26 @@ describe Spree::Admin::ReportsController, :type => :controller do
     it 'should have the proper sales total report description' do
       expect(Spree::Admin::ReportsController.available_reports[:sales_total][:description]).to eql('Sales Total For All Orders')
     end
-
   end
 
   describe 'ReportsController.add_available_report!' do
     context 'when adding the report name' do
       it 'should contain the report' do
+        I18n.backend.store_translations(:en, spree: {
+          some_report: 'Awesome Report',
+          some_report_description: 'This report is great!'
+        })
         Spree::Admin::ReportsController.add_available_report!(:some_report)
         expect(Spree::Admin::ReportsController.available_reports.keys.include?(:some_report)).to be true
+        expect(Spree::Admin::ReportsController.available_reports[:some_report]).to eq(
+          name: 'Awesome Report',
+          description: 'This report is great!'
+        )
       end
     end
   end
 
   describe 'GET sales_total' do
-
     let!(:order_complete_start_of_month) { create(:completed_order_with_totals) }
     let!(:order_complete_mid_month) { create(:completed_order_with_totals) }
     let!(:order_non_complete) { create(:order, completed_at: nil) }
@@ -67,7 +73,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
     end
 
     context 'when no dates are specified' do
-      let(:params) { { } }
+      let(:params) { {} }
 
       it_behaves_like 'sales total report' do
         let(:expected_returned_orders) { [order_complete_mid_month, order_complete_start_of_month] }
@@ -76,7 +82,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
             'USD' => {
               item_total: Money.new(2000, 'USD'),
               adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(22000, 'USD')
+              sales_total: Money.new(22_000, 'USD')
             }
           }
         }
@@ -93,7 +99,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
             'USD' => {
               item_total: Money.new(1000, 'USD'),
               adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(11000, 'USD')
+              sales_total: Money.new(11_000, 'USD')
             }
           }
         }
@@ -110,7 +116,7 @@ describe Spree::Admin::ReportsController, :type => :controller do
             'USD' => {
               item_total: Money.new(1000, 'USD'),
               adjustment_total: Money.new(0, 'USD'),
-              sales_total: Money.new(11000, 'USD')
+              sales_total: Money.new(11_000, 'USD')
             }
           }
         }
@@ -126,9 +132,8 @@ describe Spree::Admin::ReportsController, :type => :controller do
   end
 
   after(:each) do
-    Spree::Admin::ReportsController.available_reports.delete_if do |key, value|
+    Spree::Admin::ReportsController.available_reports.delete_if do |key, _value|
       key != :sales_total
     end
   end
-
 end

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

@@ -12,7 +12,7 @@ module Spree
   end
 end
 
-describe Spree::Admin::WidgetsController, :type => :controller do
+describe Spree::Admin::WidgetsController, type: :controller do
   stub_authorization!
 
   after(:all) do
@@ -69,7 +69,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
 
   describe '#create' do
     let(:params) do
-      {widget: {name: 'a widget'}}
+      { widget: { name: 'a widget' } }
     end
 
     subject { spree_post :create, params }
@@ -80,7 +80,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
 
     context 'failure' do
       let(:params) do
-        {widget: {name: ''}} # blank name generates an error
+        { widget: { name: '' } } # blank name generates an error
       end
 
       it 'sets a flash error' do
@@ -108,7 +108,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
     let(:params) do
       {
         id: widget.to_param,
-        widget: {name: 'widget renamed'},
+        widget: { name: 'widget renamed' }
       }
     end
 
@@ -122,7 +122,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
       let(:params) do
         {
           id: widget.to_param,
-          widget: {name: ''}, # a blank name will trigger a validation error
+          widget: { name: '' }, # a blank name will trigger a validation error
         }
       end
 
@@ -135,7 +135,7 @@ describe Spree::Admin::WidgetsController, :type => :controller do
 
   describe '#destroy' do
     let!(:widget) { Widget.create!(name: 'a widget') }
-    let(:params) { {id: widget.id} }
+    let(:params) { { id: widget.id } }
 
     subject {
       spree_delete :destroy, params

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
+describe Spree::Admin::ReturnAuthorizationsController, type: :controller do
   stub_authorization!
 
   # Regression test for https://github.com/spree/spree/issues/1370 #3
@@ -77,7 +77,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
       subject do
         spree_get :edit, {
           id: return_authorization.to_param,
-          order_id: order.to_param,
+          order_id: order.to_param
         }
       end
 
@@ -90,8 +90,8 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
     context '#create failed' do
       subject do
         spree_post :create, {
-          return_authorization: {stock_location_id: nil}, # return authorization requires valid stock location, so this will fail
-          order_id: order.to_param,
+          return_authorization: { stock_location_id: nil }, # return authorization requires valid stock location, so this will fail
+          order_id: order.to_param
         }
       end
 
@@ -101,9 +101,9 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
     context '#update failed' do
       subject do
         spree_put :update, {
-          return_authorization: {stock_location_id: nil}, # return authorization requires valid stock location, so this will fail
+          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,
+          order_id: order.to_param
         }
       end
 
@@ -153,7 +153,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
     let(:params) do
       {
         order_id: order.to_param,
-        return_authorization: return_authorization_params,
+        return_authorization: return_authorization_params
       }
     end
 
@@ -161,7 +161,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
       {
         memo: "",
         stock_location_id: stock_location.id,
-        return_reason_id: return_reason.id,
+        return_reason_id: return_reason.id
       }
     end
 
@@ -178,13 +178,13 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
       {
         id: return_authorization.to_param,
         order_id: order.to_param,
-        return_authorization: return_authorization_params,
+        return_authorization: return_authorization_params
       }
     end
     let(:return_authorization_params) do
       {
         memo: "",
-        return_items_attributes: return_items_params,
+        return_items_attributes: return_items_params
       }
     end
 
@@ -193,7 +193,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
     context "adding an item" do
       let(:return_items_params) do
         {
-          '0' => {inventory_unit_id: inventory_unit_1.to_param}
+          '0' => { inventory_unit_id: inventory_unit_1.to_param }
         }
       end
 
@@ -208,7 +208,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
           create(:return_item, {
             return_authorization: return_authorization,
             inventory_unit: inventory_unit_1,
-            reception_status: 'received',
+            reception_status: 'received'
           })
         end
 
@@ -226,7 +226,7 @@ describe Spree::Admin::ReturnAuthorizationsController, :type => :controller do
 
       let(:return_items_params) do
         {
-          '0' => {id: return_item.to_param, _destroy: '1'}
+          '0' => { id: return_item.to_param, _destroy: '1' }
         }
       end
 

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::ReturnItemsController, :type => :controller do
+describe Spree::Admin::ReturnItemsController, type: :controller do
   stub_authorization!
 
   describe '#update' do
@@ -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}
+      spree_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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Admin::SearchController, :type => :controller do
+describe Spree::Admin::SearchController, type: :controller do
   stub_authorization!
 
   # Regression test for ernie/ransack#176
@@ -94,7 +94,7 @@ describe Spree::Admin::SearchController, :type => :controller do
     end
 
     context 'when idds param is not present' do
-      let(:params) { { q: {name_cont: 'jersey'} } }
+      let(:params) { { q: { name_cont: 'jersey' } } }
 
       it_should_behave_like 'product search' do
         let(:expected_products) { [product_one, product_two] }