solidus_core 1.2.3 → 1.3.0.beta1

data/spec/models/spree/stock/estimator_spec.rb

@@ -2,27 +2,44 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe Estimator, :type => :model do
-      let!(:shipping_method) { create(:shipping_method) }
-      let(:package) { build(:stock_package, contents: inventory_units.map { |i| ContentItem.new(inventory_unit) }) }
-      let(:order) { build(:order_with_line_items) }
+    describe Estimator, type: :model do
+      let(:shipping_rate) { 4.00 }
+      let!(:shipping_method) { create(:shipping_method, cost: shipping_rate, currency: currency) }
+      let(:package) do
+        build(:stock_package, contents: inventory_units.map { |i| ContentItem.new(i) }).tap do |p|
+          p.shipment = p.to_shipment
+        end
+      end
+      let(:order) { create(:order_with_line_items, shipping_method: shipping_method) }
       let(:inventory_units) { order.inventory_units }
 
-      subject { Estimator.new(order) }
+      subject { Estimator.new }
 
       context "#shipping rates" do
         before(:each) do
-          shipping_method.zones.first.members.create(:zoneable => order.ship_address.country)
-          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(true)
-          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :compute).and_return(4.00)
-          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :preferences).and_return({:currency => currency})
-          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :marked_for_destruction?)
-
-          allow(package).to receive_messages(:shipping_methods => [shipping_method])
+          shipping_method.zones.first.members.create(zoneable: order.ship_address.country)
         end
 
         let(:currency) { "USD" }
 
+        context 'without a shipment' do
+          before { package.shipment = nil }
+          it 'raises an error' do
+            expect {
+              subject.shipping_rates(package)
+            }.to raise_error(Spree::Stock::Estimator::ShipmentRequired)
+          end
+        end
+
+        context 'without an order' do
+          before { package.shipment.order = nil }
+          it 'raises an error' do
+            expect {
+              subject.shipping_rates(package)
+            }.to raise_error(Spree::Stock::Estimator::OrderRequired)
+          end
+        end
+
         shared_examples_for "shipping rate matches" do
           it "returns shipping rates" do
             shipping_rates = subject.shipping_rates(package)
@@ -42,12 +59,7 @@ module Spree
         end
 
         context "when the order's ship address is in a different zone" do
-          before { shipping_method.zones.each{|z| z.members.delete_all} }
-          it_should_behave_like "shipping rate doesn't match"
-        end
-
-        context "when the calculator is not available for that order" do
-          before { allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(false) }
+          before { shipping_method.zones.each{ |z| z.members.delete_all } }
           it_should_behave_like "shipping rate doesn't match"
         end
 
@@ -71,47 +83,51 @@ module Spree
         end
 
         it "sorts shipping rates by cost" do
-          shipping_methods = 3.times.map { create(:shipping_method) }
-          allow(shipping_methods[0]).to receive_message_chain(:calculator, :compute).and_return(5.00)
-          allow(shipping_methods[1]).to receive_message_chain(:calculator, :compute).and_return(3.00)
-          allow(shipping_methods[2]).to receive_message_chain(:calculator, :compute).and_return(4.00)
-
-          allow(subject).to receive(:shipping_methods).and_return(shipping_methods)
+          ShippingMethod.destroy_all
+          create(:shipping_method, cost: 5)
+          create(:shipping_method, cost: 3)
+          create(:shipping_method, cost: 4)
 
-          expect(subject.shipping_rates(package).map(&:cost)).to eq %w[3.00 4.00 5.00].map(&BigDecimal.method(:new))
+          expect(subject.shipping_rates(package).map(&:cost)).to eq [3.00, 4.00, 5.00]
         end
 
         context "general shipping methods" do
-          let(:shipping_methods) { 2.times.map { create(:shipping_method) } }
-
-          it "selects the most affordable shipping rate" do
-            allow(shipping_methods[0]).to receive_message_chain(:calculator, :compute).and_return(5.00)
-            allow(shipping_methods[1]).to receive_message_chain(:calculator, :compute).and_return(3.00)
-
-            allow(subject).to receive(:shipping_methods).and_return(shipping_methods)
+          before { Spree::ShippingMethod.destroy_all }
+
+          context 'with two shipping methods of different cost' do
+            let!(:shipping_methods) do
+              [
+                create(:shipping_method, cost: 5),
+                create(:shipping_method, cost: 3)
+              ]
+            end
 
-            expect(subject.shipping_rates(package).sort_by(&:cost).map(&:selected)).to eq [true, false]
+            it "selects the most affordable shipping rate" do
+              expect(subject.shipping_rates(package).sort_by(&:cost).map(&:selected)).to eq [true, false]
+            end
           end
 
-          it "selects the most affordable shipping rate and doesn't raise exception over nil cost" do
-            allow(shipping_methods[0]).to receive_message_chain(:calculator, :compute).and_return(1.00)
-            allow(shipping_methods[1]).to receive_message_chain(:calculator, :compute).and_return(nil)
+          context 'with one of the shipping methods having nil cost' do
+            let!(:shipping_methods) do
+              [
+                create(:shipping_method, cost: 1),
+                create(:shipping_method, cost: nil)
+              ]
+            end
 
-            allow(subject).to receive(:shipping_methods).and_return(shipping_methods)
+            it "selects the most affordable shipping rate and doesn't raise exception over nil cost" do
+              allow(shipping_methods[1]).to receive_message_chain(:calculator, :compute).and_return(nil)
+              allow(subject).to receive(:shipping_methods).and_return(shipping_methods)
 
-            subject.shipping_rates(package)
+              expect(subject.shipping_rates(package).map(&:shipping_method)).to eq([shipping_methods[0]])
+            end
           end
         end
 
         context "involves backend only shipping methods" do
-          let(:backend_method) { create(:shipping_method, display_on: "back_end") }
-          let(:generic_method) { create(:shipping_method) }
-
-          before do
-            allow(backend_method).to receive_message_chain(:calculator, :compute).and_return(0.00)
-            allow(generic_method).to receive_message_chain(:calculator, :compute).and_return(5.00)
-            allow(subject).to receive(:shipping_methods).and_return([backend_method, generic_method])
-          end
+          before{ Spree::ShippingMethod.destroy_all }
+          let!(:backend_method) { create(:shipping_method, display_on: "back_end", cost: 0.00) }
+          let!(:generic_method) { create(:shipping_method, cost: 5.00) }
 
           it "does not return backend rates at all" do
             expect(subject.shipping_rates(package).map(&:shipping_method_id)).to eq([generic_method.id])
@@ -127,22 +143,17 @@ module Spree
           let!(:tax_rate) { create(:tax_rate, zone: order.tax_zone) }
 
           before do
-            Spree::ShippingMethod.all.each do |sm|
-              sm.tax_category_id = tax_rate.tax_category_id
-              sm.save
-            end
-            package.shipping_methods.map(&:reload)
+            shipping_method.update!(tax_category: tax_rate.tax_category)
           end
 
-
           it "links the shipping rate and the tax rate" do
             shipping_rates = subject.shipping_rates(package)
-            expect(shipping_rates.first.tax_rate).to eq(tax_rate)
+            expect(shipping_rates.first.taxes.first.tax_rate).to eq(tax_rate)
           end
         end
 
         it 'uses the configured shipping rate selector' do
-          shipping_rate = Spree::ShippingRate.new
+          shipping_rate = build(:shipping_rate)
           allow(Spree::ShippingRate).to receive(:new).and_return(shipping_rate)
 
           selector_class = Class.new do
@@ -174,6 +185,24 @@ module Spree
 
           Spree::Config.shipping_rate_sorter_class = nil
         end
+
+        it 'uses the configured shipping rate taxer' do
+          class Spree::Tax::TestTaxer
+            def initialize
+            end
+
+            def tax(_)
+              Spree::ShippingRate.new
+            end
+          end
+          Spree::Config.shipping_rate_taxer_class = Spree::Tax::TestTaxer
+
+          shipping_rate = Spree::ShippingRate.new
+          allow(Spree::ShippingRate).to receive(:new).and_return(shipping_rate)
+
+          expect(Spree::Tax::TestTaxer).to receive(:new).and_call_original
+          subject.shipping_rates(package)
+        end
       end
     end
   end

data/spec/models/spree/stock/inventory_unit_builder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe InventoryUnitBuilder, :type => :model do
+    describe InventoryUnitBuilder, type: :model do
       let(:line_item_1) { build(:line_item) }
       let(:line_item_2) { build(:line_item, quantity: 2) }
       let(:order) { build(:order, line_items: [line_item_1, line_item_2]) }
@@ -30,9 +30,7 @@ module Spree
         it "associates the inventory units to the order" do
           expect(subject.units.map(&:order).uniq).to eq [order]
         end
-
       end
-
     end
   end
 end

data/spec/models/spree/stock/package_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe Package, :type => :model do
+    describe Package, type: :model do
       let(:variant) { build(:variant, weight: 25.0) }
       let(:stock_location) { build(:stock_location) }
       let(:order) { build(:order) }
@@ -10,7 +10,7 @@ module Spree
       subject { Package.new(stock_location) }
 
       def build_inventory_unit
-        build(:inventory_unit, variant: variant)
+        build(:inventory_unit, variant: variant, order: order)
       end
 
       it 'calculates the weight of all the contents' do
@@ -47,6 +47,24 @@ module Spree
         expect(item.quantity).to eq 1
       end
 
+      it 'builds the correct list of shipping methods based on stock location and categories' do
+        category1 = create(:shipping_category)
+        category2 = create(:shipping_category)
+        method1   = create(:shipping_method, available_to_all: true)
+        method2   = create(:shipping_method, stock_locations: [stock_location])
+        method1.shipping_categories = [category1, category2]
+        method2.shipping_categories = [category1, category2]
+        variant1 = mock_model(Variant, shipping_category_id: category1.id)
+        variant2 = mock_model(Variant, shipping_category_id: category2.id)
+        variant3 = mock_model(Variant, shipping_category_id: nil)
+        contents = [ContentItem.new(build(:inventory_unit, variant: variant1)),
+                    ContentItem.new(build(:inventory_unit, variant: variant1)),
+                    ContentItem.new(build(:inventory_unit, variant: variant2)),
+                    ContentItem.new(build(:inventory_unit, variant: variant3))]
+
+        package = Package.new(stock_location, contents)
+        expect(package.shipping_methods).to match_array([method1, method2])
+      end
       # Contains regression test for https://github.com/spree/spree/issues/2804
       it 'builds a list of shipping methods common to all categories' do
         category1 = create(:shipping_category)
@@ -55,20 +73,20 @@ module Spree
         method2   = create(:shipping_method)
         method1.shipping_categories = [category1, category2]
         method2.shipping_categories = [category1]
-        variant1 = mock_model(Variant, shipping_category: category1)
-        variant2 = mock_model(Variant, shipping_category: category2)
-        variant3 = mock_model(Variant, shipping_category: nil)
+        variant1 = mock_model(Variant, shipping_category_id: category1.id)
+        variant2 = mock_model(Variant, shipping_category_id: category2.id)
+        variant3 = mock_model(Variant, shipping_category_id: nil)
         contents = [ContentItem.new(build(:inventory_unit, variant: variant1)),
                     ContentItem.new(build(:inventory_unit, variant: variant1)),
                     ContentItem.new(build(:inventory_unit, variant: variant2)),
                     ContentItem.new(build(:inventory_unit, variant: variant3))]
 
         package = Package.new(stock_location, contents)
-        expect(package.shipping_methods).to eq([method1])
+        expect(package.shipping_methods).to match_array([method1])
       end
 
       it 'builds an empty list of shipping methods when no categories' do
-        variant  = mock_model(Variant, shipping_category: nil)
+        variant  = mock_model(Variant, shipping_category_id: nil)
         contents = [ContentItem.new(build(:inventory_unit, variant: variant))]
         package  = Package.new(stock_location, contents)
         expect(package.shipping_methods).to be_empty
@@ -79,9 +97,9 @@ module Spree
         subject.add build_inventory_unit, :backordered
 
         shipping_method = build(:shipping_method)
-        subject.shipping_rates = [ Spree::ShippingRate.new(shipping_method: shipping_method, cost: 10.00, selected: true) ]
 
         shipment = subject.to_shipment
+        shipment.shipping_rates = [Spree::ShippingRate.new(shipping_method: shipping_method, cost: 10.00, selected: true)]
         expect(shipment.stock_location).to eq subject.stock_location
         expect(shipment.inventory_units.size).to eq 3
 
@@ -95,6 +113,7 @@ module Spree
         expect(last_unit.state).to eq 'backordered'
 
         expect(shipment.shipping_method).to eq shipping_method
+        expect(shipment.address).to eq order.ship_address
       end
 
       it 'does not add an inventory unit to a package twice' do
@@ -124,7 +143,6 @@ module Spree
       describe "#remove" do
         let(:unit) { build_inventory_unit }
         context "there is a content item for the inventory unit" do
-
           before { subject.add unit }
 
           it "removes that content item" do
@@ -143,7 +161,6 @@ module Spree
       describe "#order" do
         let(:unit) { build_inventory_unit }
         context "there is an inventory unit" do
-
           before { subject.add unit }
 
           it "returns an order" do

data/spec/models/spree/stock/packer_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe Packer, :type => :model do
-      let!(:inventory_units) { 5.times.map { build(:inventory_unit) } }
+    describe Packer, type: :model do
+      let!(:inventory_units) { Array.new(5) { build(:inventory_unit) } }
       let(:stock_location) { create(:stock_location) }
 
       subject { Packer.new(stock_location, inventory_units) }
@@ -63,12 +63,12 @@ module Spree
           let(:order) { build(:order_with_line_items, line_items_count: 1) }
           let(:line_item) { order.line_items.first }
           let(:inventory_units) {
-            30.times.map do
+            Array.new(30) do
               build(
                 :inventory_unit,
                 order: order,
                 line_item: line_item,
-                variant: variant,
+                variant: variant
               )
             end
           }

data/spec/models/spree/stock/prioritizer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Stock
-    describe Prioritizer, :type => :model do
+    describe Prioritizer, type: :model do
       let(:order) { mock_model(Order) }
       let(:stock_location) { build(:stock_location) }
       let(:variant) { build(:variant) }

data/spec/models/spree/stock/quantifier_spec.rb

@@ -10,10 +10,9 @@ end
 
 module Spree
   module Stock
-    describe Quantifier, :type => :model do
-
+    describe Quantifier, type: :model do
       let(:target_stock_location) { nil }
-      let!(:stock_location) { create :stock_location_with_items  }
+      let!(:stock_location) { create :stock_location_with_items }
       let!(:stock_item) { stock_location.stock_items.order(:id).first }
 
       subject { described_class.new(stock_item.variant, target_stock_location) }
@@ -58,7 +57,6 @@ module Spree
             expect(subject.can_supply?(11)).to be false
           end
         end
-
       end
 
       context 'with multiple stock locations/items' do
@@ -91,7 +89,6 @@ module Spree
             expect(subject.can_supply?(16)).to be false
           end
         end
-
       end
 
       context 'with a specific stock location' do
@@ -109,7 +106,6 @@ module Spree
           expect(subject.can_supply?(6)).to eq false
         end
       end
-
     end
   end
 end

data/spec/models/spree/stock/splitter/backordered_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Spree
   module Stock
     module Splitter
-      describe Backordered, :type => :model do
+      describe Backordered, type: :model do
         let(:variant) { build(:variant) }
 
         let(:packer) { build(:stock_packer) }

data/spec/models/spree/stock/splitter/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Spree
   module Stock
     module Splitter
-      describe Base, :type => :model do
+      describe Base, type: :model do
         let(:packer) { build(:stock_packer) }
 
         it 'continues to splitter chain' do
@@ -14,7 +14,6 @@ module Spree
           expect(splitter1).to receive(:split).with(packages)
           splitter2.split(packages)
         end
-
       end
     end
   end

data/spec/models/spree/stock/splitter/shipping_category_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 module Spree
   module Stock
     module Splitter
-      describe ShippingCategory, :type => :model do
-
+      describe ShippingCategory, type: :model do
         let(:order) { create(:order_with_line_items, line_items_count: 1) }
         let(:line_item) { order.line_items.first }
         let(:variant1) { build(:variant) }
@@ -43,7 +42,6 @@ module Spree
           expect(packages[2].quantity).to eq 6
           expect(packages[3].quantity).to eq 9
         end
-
       end
     end
   end

data/spec/models/spree/stock/splitter/weight_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 module Spree
   module Stock
     module Splitter
-      describe Weight, :type => :model do
+      describe Weight, type: :model do
         let(:packer) { build(:stock_packer) }
-        let(:variant) { build(:base_variant, :weight => 100) }
+        let(:variant) { build(:base_variant, weight: 100) }
 
         subject { Weight.new(packer) }
 
@@ -18,7 +18,7 @@ module Spree
 
         it 'handles packages that can not be reduced' do
           package = Package.new(packer.stock_location)
-          allow(variant).to receive_messages(:weight => 200)
+          allow(variant).to receive_messages(weight: 200)
           2.times { package.add build(:inventory_unit, variant: variant) }
           packages = subject.split([package])
           expect(packages.size).to eq 2

data/spec/models/spree/stock_item_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::StockItem, :type => :model do
+describe Spree::StockItem, type: :model do
   let(:stock_location) { create(:stock_location_with_items) }
 
   subject { stock_location.stock_items.order(:id).first }
@@ -37,21 +37,21 @@ describe Spree::StockItem, :type => :model do
     context 'when count_on_hand > 0' do
       before(:each) do
         subject.update_column('count_on_hand', 4)
-         subject.reduce_count_on_hand_to_zero
-       end
+        subject.reduce_count_on_hand_to_zero
+      end
 
-       it { expect(subject.count_on_hand).to eq(0) }
-     end
+      it { expect(subject.count_on_hand).to eq(0) }
+    end
 
-     context 'when count_on_hand > 0' do
-       before(:each) do
-         subject.update_column('count_on_hand', -4)
-         @count_on_hand = subject.count_on_hand
-         subject.reduce_count_on_hand_to_zero
-       end
+    context 'when count_on_hand > 0' do
+      before(:each) do
+        subject.update_column('count_on_hand', -4)
+        @count_on_hand = subject.count_on_hand
+        subject.reduce_count_on_hand_to_zero
+      end
 
-       it { expect(subject.count_on_hand).to eq(@count_on_hand) }
-     end
+      it { expect(subject.count_on_hand).to eq(@count_on_hand) }
+    end
   end
 
   context "adjust count_on_hand" do
@@ -73,7 +73,7 @@ describe Spree::StockItem, :type => :model do
       let(:inventory_unit_2) { double('InventoryUnit2') }
 
       before do
-        allow(subject).to receive_messages(:backordered_inventory_units => [inventory_unit, inventory_unit_2])
+        allow(subject).to receive_messages(backordered_inventory_units: [inventory_unit, inventory_unit_2])
         subject.update_column(:count_on_hand, -2)
       end
 
@@ -94,7 +94,7 @@ describe Spree::StockItem, :type => :model do
       end
 
       context "adds new items" do
-        before { allow(subject).to receive_messages(:backordered_inventory_units => [inventory_unit, inventory_unit_2]) }
+        before { allow(subject).to receive_messages(backordered_inventory_units: [inventory_unit, inventory_unit_2]) }
 
         it "fills existing backorders" do
           expect(inventory_unit).to receive(:fill_backorder)
@@ -132,7 +132,7 @@ describe Spree::StockItem, :type => :model do
       end
 
       context "adds new items" do
-        before { allow(subject).to receive_messages(:backordered_inventory_units => [inventory_unit, inventory_unit_2]) }
+        before { allow(subject).to receive_messages(backordered_inventory_units: [inventory_unit, inventory_unit_2]) }
 
         it "fills existing backorders" do
           expect(inventory_unit).to receive(:fill_backorder)

data/spec/models/spree/stock_location_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe StockLocation, :type => :model do
+  describe StockLocation, type: :model do
     subject { create(:stock_location_with_items, backorderable_default: true) }
     let(:stock_item) { subject.stock_items.order(:id).first }
     let(:variant) { stock_item.variant }
@@ -88,7 +88,7 @@ module Spree
     end
 
     it 'returns nil when stock_item is not found for variant' do
-      stock_item = subject.stock_item(100)
+      stock_item = subject.stock_item(0)
       expect(stock_item).to be_nil
     end
 
@@ -137,14 +137,14 @@ module Spree
     end
 
     it 'can be deactivated' do
-      create(:stock_location, :active => true)
-      create(:stock_location, :active => false)
+      create(:stock_location, active: true)
+      create(:stock_location, active: false)
       expect(Spree::StockLocation.active.count).to eq 1
     end
 
     it 'ensures only one stock location is default at a time' do
-      first = create(:stock_location, :active => true, :default => true)
-      second = create(:stock_location, :active => true, :default => true)
+      first = create(:stock_location, active: true, default: true)
+      second = create(:stock_location, active: true, default: true)
 
       expect(first.reload.default).to eq false
       expect(second.reload.default).to eq true
@@ -240,7 +240,6 @@ module Spree
       end
     end
 
-
     describe "#move" do
       let!(:variant) { create(:variant) }
       def move
@@ -268,7 +267,6 @@ module Spree
             }.not_to change { subject.stock_items.count }
           end
         end
-
       end
     end
   end

data/spec/models/spree/stock_movement_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::StockMovement, :type => :model do
+describe Spree::StockMovement, type: :model do
   let(:stock_location) { create(:stock_location_with_items) }
   let(:stock_item) { stock_location.stock_items.order(:id).first }
   subject { build(:stock_movement, stock_item: stock_item) }

data/spec/models/spree/stock_transfer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe StockTransfer, :type => :model do
+  describe StockTransfer, type: :model do
     let(:destination_location) { create(:stock_location_with_items) }
     let(:source_location) { create(:stock_location_with_items) }
     let(:stock_item) { source_location.stock_items.order(:id).first }
@@ -279,7 +279,6 @@ module Spree
       subject { stock_transfer.transfer }
 
       context 'with enough stock' do
-
         it 'creates stock movements for transfer items' do
           expect{ subject }.to change{ Spree::StockMovement.count }.by(stock_transfer.transfer_items.count)
         end
@@ -303,7 +302,6 @@ module Spree
         it 'returns false' do
           expect(subject).to eq false
         end
-
       end
     end
   end

data/spec/models/spree/store_credit_category_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::StoreCreditCategory, :type => :model do
+describe Spree::StoreCreditCategory, type: :model do
   describe "#non_expiring?" do
     let(:store_credit_category) { build(:store_credit_category, name: category_name) }
 

data/spec/models/spree/store_credit_event_spec.rb

@@ -1,12 +1,10 @@
 require 'spec_helper'
 
 describe Spree::StoreCreditEvent do
-
   describe ".exposed_events" do
-
     [
       Spree::StoreCredit::ELIGIBLE_ACTION,
-      Spree::StoreCredit::AUTHORIZE_ACTION,
+      Spree::StoreCredit::AUTHORIZE_ACTION
     ].each do |action|
       let(:action) { action }
       it "excludes #{action} actions" do
@@ -19,7 +17,7 @@ describe Spree::StoreCreditEvent do
       Spree::StoreCredit::VOID_ACTION,
       Spree::StoreCredit::CREDIT_ACTION,
       Spree::StoreCredit::CAPTURE_ACTION,
-      Spree::StoreCredit::ALLOCATION_ACTION,
+      Spree::StoreCredit::ALLOCATION_ACTION
     ].each do |action|
       it "includes #{action} actions" do
         event = create(:store_credit_event, action: action)
@@ -231,7 +229,7 @@ describe Spree::StoreCreditEvent do
   end
 
   describe "#display_action" do
-    subject { event.display_action  }
+    subject { event.display_action }
 
     context "capture event" do
       let(:event) { create(:store_credit_capture_event) }