solidus_core 1.2.3 → 1.3.0.beta1

data/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'stock package factory' do
     let(:factory) { :stock_package }
 
     it "builds successfully" do
-      expect(build factory).to be_a(factory_class)
+      expect(build(factory)).to be_a(factory_class)
     end
 
     # No test for .create, as it's a PORO
@@ -18,7 +18,7 @@ RSpec.describe 'stock package factory' do
     let(:factory) { :stock_package_fulfilled }
 
     it "builds successfully" do
-      expect(build factory).to be_a(factory_class)
+      expect(build(factory)).to be_a(factory_class)
     end
 
     # No test for .create, as it's a PORO

data/spec/lib/spree/core/testing_support/factories/stock_packer_factory_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe 'stock packer factory' do
     let(:factory) { :stock_packer }
 
     it "builds successfully" do
-      expect(build factory).to be_a(factory_class)
+      expect(build(factory)).to be_a(factory_class)
     end
 
     # No test for .create, as it's a PORO

data/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb

@@ -7,9 +7,8 @@ RSpec.describe 'store credit event factory' do
   describe 'plain store credit event' do
     let(:factory) { :store_credit_event }
 
-
     it "builds successfully" do
-      expect(build factory).to be_a(factory_class)
+      expect(build(factory)).to be_a(factory_class)
     end
 
     # No test for .create, as this base factory misses an `action`

data/spec/lib/spree/core/testing_support/preferences_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+RSpec.describe Spree::TestingSupport::Preferences do
+  describe 'resetting the app configuration' do
+    before do
+      @original_spree_mails_from = Spree::Config.mails_from
+      @original_spree_searcher_class = Spree::Config.searcher_class
+      class MySearcherClass; end
+      include Spree::TestingSupport::Preferences
+      Spree::Config.mails_from = "hello@myserver.com"
+      Spree::Config.searcher_class = MySearcherClass
+    end
+
+    it 'resets normal preferences' do
+      expect(Spree::Config.mails_from).to eq("hello@myserver.com")
+      reset_spree_preferences
+      expect(Spree::Config.mails_from).to eq(@original_spree_mails_from)
+    end
+
+    it 'resets cached configuration instance variables' do
+      expect(Spree::Config.searcher_class).to eq(MySearcherClass)
+      reset_spree_preferences
+      expect(Spree::Config.searcher_class).to eq(@original_spree_searcher_class)
+    end
+  end
+end

data/spec/lib/spree/core/unreturned_item_charger_spec.rb

@@ -1,17 +1,21 @@
 require 'spec_helper'
 
 describe Spree::UnreturnedItemCharger do
-  let(:shipped_order) { create(:shipped_order, line_items_count: 1, with_cartons: false) }
+  let(:ship_address) { create(:address) }
+  let(:shipped_order) { create(:shipped_order, ship_address: ship_address, line_items_count: 1, with_cartons: false) }
   let(:original_shipment) { shipped_order.shipments.first }
   let(:original_stock_location) { original_shipment.stock_location }
   let(:original_inventory_unit) { shipped_order.inventory_units.first }
   let(:original_variant) { original_inventory_unit.variant }
+  let(:shipping_method) { create(:shipping_method, tax_category: original_variant.tax_category) }
+
   let(:exchange_shipment) do
     create(:shipment,
            order: shipped_order,
            state: 'shipped',
            stock_location: original_stock_location,
-           created_at: 5.days.ago)
+           created_at: 5.days.ago,
+           shipping_method: shipping_method)
   end
   let(:exchange_inventory_unit) { exchange_shipment.inventory_units.first }
   let(:return_item) do
@@ -43,12 +47,11 @@ describe Spree::UnreturnedItemCharger do
     end
 
     context 'in tax zone' do
-      let!(:tax_zone) { Spree::Zone.find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone) }
+      let!(:tax_zone) { create(:zone, countries: [ship_address.country]) }
       let!(:tax_rate) { create(:tax_rate, zone: tax_zone, tax_category: original_variant.tax_category) }
       before { tax_zone.update_attributes!(default_tax: true) }
 
       it "applies tax" do
-        exchange_shipment.shipping_rates.update_all(tax_rate_id: tax_rate.id)
         exchange_order = exchange_shipment.order
         exchange_order.create_tax_charge!
         exchange_order.update!
@@ -59,11 +62,6 @@ describe Spree::UnreturnedItemCharger do
       end
     end
 
-    it "updates shipment cost" do
-      exchange_shipment.update_attributes!(cost: 0)
-      expect { subject }.to change { exchange_shipment.reload.cost }
-    end
-
     it "creates a new completed order" do
       expect { subject }.to change { Spree::Order.count }.by(1)
       expect(new_order).to_not eq(shipped_order)

data/spec/lib/spree/core/validators/email_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe EmailValidator do
-
   class Tester
     include ActiveModel::Validations
     attr_accessor :email_address
     validates :email_address, email: true
   end
 
-  let(:valid_emails) {[
+  let(:valid_emails) {
+    [
     'valid@email.com',
     'valid@email.com.uk',
     'e@email.com',
@@ -16,8 +16,10 @@ describe EmailValidator do
     'valid-email@email.com',
     'valid_email@email.com',
     'valid.email@email.com'
-  ]}
-  let(:invalid_emails) {[
+  ]
+  }
+  let(:invalid_emails) {
+    [
     'invalid email@email.com',
     '.invalid.email@email.com',
     'invalid.email.@email.com',
@@ -27,7 +29,8 @@ describe EmailValidator do
     '@invalid.email@email.com',
     'invalid@email@email.com',
     'invalid.email@@email.com'
-  ]}
+  ]
+  }
 
   it 'validates valid email addresses' do
     tester = Tester.new
@@ -44,5 +47,4 @@ describe EmailValidator do
       expect(tester.valid?).to be false
     end
   end
-
 end

data/spec/lib/spree/localized_number_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
 describe Spree::LocalizedNumber do
-
   context ".parse" do
     before do
       I18n.enforce_available_locales = false
       I18n.locale = I18n.default_locale
-      I18n.backend.store_translations(:de, { :number => { :currency => { :format => { :delimiter => '.', :separator => ',' } } } })
+      I18n.backend.store_translations(:de, { number: { currency: { format: { delimiter: '.', separator: ',' } } } })
     end
 
     after do
@@ -34,5 +33,4 @@ describe Spree::LocalizedNumber do
       end
     end
   end
-
 end

data/spec/lib/spree/migrations_spec.rb

@@ -10,7 +10,7 @@ module Spree
     let(:engine_dir) { "dir/db/migrate" }
     let(:app_dir) { "#{Rails.root}/db/migrate" }
 
-    subject { described_class.new(config, "spree")  }
+    subject { described_class.new(config, "spree") }
 
     before do
       expect(File).to receive(:directory?).with(app_dir).and_return true
@@ -28,7 +28,7 @@ module Spree
     context "no missing migrations" do
       it "says nothing" do
         expect(Dir).to receive(:entries).with(engine_dir).and_return engine_migrations
-        expect(Dir).to receive(:entries).with(app_dir).and_return (app_migrations + engine_migrations)
+        expect(Dir).to receive(:entries).with(app_dir).and_return(app_migrations + engine_migrations)
         expect(subject.check).to eq nil
       end
     end

data/spec/lib/spree/money_spec.rb

@@ -20,7 +20,7 @@ describe Spree::Money do
 
   context "with currency" do
     it "passed in option" do
-      money = Spree::Money.new(10, :with_currency => true, :html => false)
+      money = Spree::Money.new(10, with_currency: true, html: false)
       expect(money.to_s).to eq("$10.00 USD")
     end
   end
@@ -40,14 +40,14 @@ describe Spree::Money do
   context "currency parameter" do
     context "when currency is specified in Canadian Dollars" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(10, :currency => 'CAD', :with_currency => true, :html => false)
+        money = Spree::Money.new(10, currency: 'CAD', with_currency: true, html: false)
         expect(money.to_s).to eq("$10.00 CAD")
       end
     end
 
     context "when currency is specified in Japanese Yen" do
       it "uses the currency param over the global configuration" do
-        money = Spree::Money.new(100, :currency => 'JPY', :html => false)
+        money = Spree::Money.new(100, currency: 'JPY', html: false)
         expect(money.to_s).to eq("¥100")
       end
     end
@@ -55,7 +55,7 @@ describe Spree::Money do
 
   context "symbol positioning" do
     it "passed in option" do
-      money = Spree::Money.new(10, :symbol_position => :after, :html => false)
+      money = Spree::Money.new(10, symbol_position: :after, html: false)
       expect(money.to_s).to eq("10.00 $")
     end
 
@@ -72,7 +72,7 @@ describe Spree::Money do
     end
 
     it "passed in option" do
-      money = Spree::Money.new(-10, :sign_before_symbol => false)
+      money = Spree::Money.new(-10, sign_before_symbol: false)
       expect(money.to_s).to eq("$-10.00")
     end
   end
@@ -85,7 +85,7 @@ describe Spree::Money do
     end
 
     it "formats correctly" do
-      money = Spree::Money.new(1000, :html => false)
+      money = Spree::Money.new(1000, html: false)
       expect(money.to_s).to eq("¥1,000")
     end
   end
@@ -124,4 +124,73 @@ describe Spree::Money do
       expect(money.as_json(options)).to eq("$10.00")
     end
   end
+
+  describe 'subtraction' do
+    context "for money objects with same currency" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "USD") }
+      let(:money_2) { Spree::Money.new(15.00, currency: "USD") }
+
+      it "subtracts correctly" do
+        expect(money_1 - money_2).to eq(Spree::Money.new(17.00, currency: "USD"))
+      end
+    end
+
+    context "when trying to subtract money objects in different currencies" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "EUR") }
+      let(:money_2) { Spree::Money.new(15.00, currency: "USD") }
+
+      it "will not work" do
+        expect { money_1 - money_2 }.to raise_error(Money::Bank::UnknownRate)
+      end
+    end
+
+    context "if other does not respond to .money" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "EUR") }
+      let(:money_2) { ::Money.new(1500) }
+
+      it 'raises a TypeError' do
+        expect { money_1 - money_2 }.to raise_error(TypeError)
+      end
+    end
+  end
+
+  describe 'addition' do
+    context "for money objects with same currency" do
+      let(:money_1) { Spree::Money.new(37.00, currency: "USD") }
+      let(:money_2) { Spree::Money.new(15.00, currency: "USD") }
+
+      it "subtracts correctly" do
+        expect(money_1 + money_2).to eq(Spree::Money.new(52.00, currency: "USD"))
+      end
+    end
+
+    context "when trying to subtract money objects in different currencies" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "EUR") }
+      let(:money_2) { Spree::Money.new(15.00, currency: "USD") }
+
+      it "will not work" do
+        expect { money_1 + money_2 }.to raise_error(Money::Bank::UnknownRate)
+      end
+    end
+
+    context "if other does not respond to .money" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "EUR") }
+      let(:money_2) { ::Money.new(1500) }
+
+      it 'raises a TypeError' do
+        expect { money_1 + money_2 }.to raise_error(TypeError)
+      end
+    end
+  end
+
+  describe 'equality checks' do
+    context "if other does not respond to .money" do
+      let(:money_1) { Spree::Money.new(32.00, currency: "EUR") }
+      let(:money_2) { ::Money.new(1500) }
+
+      it 'raises a TypeError' do
+        expect { money_1 == money_2 }.to raise_error(TypeError)
+      end
+    end
+  end
 end

data/spec/lib/tasks/exchanges_spec.rb

@@ -17,13 +17,10 @@ describe "exchanges:charge_unreturned_items" do
   end
 
   before do
-    @original_expedited_exchanges_pref = Spree::Config[:expedited_exchanges]
     Spree::Config[:expedited_exchanges] = true
     Spree::StockItem.update_all(count_on_hand: 10)
   end
 
-  after { Spree::Config[:expedited_exchanges] = @original_expedited_exchanges_pref }
-
   context "there are no unreturned items" do
     it { expect { subject.invoke }.not_to change { Spree::Order.count } }
   end
@@ -39,7 +36,7 @@ describe "exchanges:charge_unreturned_items" do
       Spree::Shipment.last.ship!
       return_item_1.lost!
       return_item_2.give!
-      Timecop.travel (Spree::Config[:expedited_exchanges_days_window] + 1).days
+      Timecop.travel((Spree::Config[:expedited_exchanges_days_window] + 1).days)
     end
     after { Timecop.return }
     it { expect { subject.invoke }.not_to change { Spree::Order.count } }
@@ -70,7 +67,6 @@ describe "exchanges:charge_unreturned_items" do
     end
 
     context "more than the config allowed days have passed" do
-
       let(:travel_time) { (Spree::Config[:expedited_exchanges_days_window] + 1).days }
 
       it "creates a new completed order" do
@@ -120,12 +116,9 @@ describe "exchanges:charge_unreturned_items" do
 
         context "auto_capture_exchanges is true" do
           before do
-            @original_auto_capture_exchanges = Spree::Config[:auto_capture_exchanges]
             Spree::Config[:auto_capture_exchanges] = true
           end
 
-          after { Spree::Config[:auto_capture_exchanges] = @original_auto_capture_exchanges }
-
           it 'creates a pending payment' do
             expect { subject.invoke }.to change { Spree::Payment.count }.by(1)
             payment = Spree::Payment.last
@@ -135,12 +128,9 @@ describe "exchanges:charge_unreturned_items" do
 
         context "auto_capture_exchanges is false" do
           before do
-            @original_auto_capture_exchanges = Spree::Config[:auto_capture_exchanges]
             Spree::Config[:auto_capture_exchanges] = false
           end
 
-          after { Spree::Config[:auto_capture_exchanges] = @original_auto_capture_exchanges }
-
           it 'captures payment' do
             expect { subject.invoke }.to change { Spree::Payment.count }.by(1)
             payment = Spree::Payment.last
@@ -157,7 +147,7 @@ describe "exchanges:charge_unreturned_items" do
 
       it "associates the store of the original order with the exchange order" do
         store = order.store
-        expect(Spree::Order).to receive(:create!).once.with(hash_including({store_id: store.id})).and_call_original
+        expect(Spree::Order).to receive(:create!).once.with(hash_including({ store_id: store.id })).and_call_original
         subject.invoke
       end
 

data/spec/lib/tasks/migrations/copy_shipped_shipments_to_cartons_spec.rb

@@ -111,5 +111,4 @@ describe 'spree:migrations:copy_shipped_shipments_to_cartons' do
       expect(preexisting_carton_inventory_units.map(&:reload).map(&:carton_id)).to all(eq preexisting_carton.id)
     end
   end
-
 end

data/spec/lib/tasks/order_capturing_spec.rb

@@ -28,7 +28,7 @@ describe "order_capturing:capture_payments" do
 
     it "charges the order" do
       expect(order.inventory_units.any?(&:on_hand?)).to eq false
-      expect(order.inventory_units.all? {|iu| iu.canceled? || iu.shipped? }).to eq true
+      expect(order.inventory_units.all? { |iu| iu.canceled? || iu.shipped? }).to eq true
       expect {
         expect { subject.invoke }.to change { payment.reload.state }.to('completed')
       }.to change { order.reload.payment_state }.to('paid')

data/spec/mailers/carton_mailer_spec.rb

@@ -11,8 +11,8 @@ describe Spree::CartonMailer do
   # Regression test for https://github.com/spree/spree/issues/2196
   it "doesn't include out of stock in the email body" do
     shipment_email = Spree::CartonMailer.shipped_email(order: order, carton: carton)
-    expect(shipment_email.body).not_to include(%Q{Out of Stock})
-    expect(shipment_email.body).to include(%Q{Your order has been shipped})
+    expect(shipment_email.body).not_to include(%{Out of Stock})
+    expect(shipment_email.body).to include(%{Your order has been shipped})
     expect(shipment_email.subject).to eq "#{order.store.name} Shipment Notification ##{order.number}"
   end
 
@@ -36,7 +36,7 @@ describe Spree::CartonMailer do
     context "shipped_email" do
       context "pt-BR locale" do
         before do
-          pt_br_shipped_email = { :spree => { :shipment_mailer => { :shipped_email => { :dear_customer => 'Caro Cliente,' } } } }
+          pt_br_shipped_email = { spree: { shipment_mailer: { shipped_email: { dear_customer: 'Caro Cliente,' } } } }
           I18n.backend.store_translations :'pt-BR', pt_br_shipped_email
           I18n.locale = :'pt-BR'
         end

data/spec/mailers/order_mailer_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 require 'email_spec'
 
-describe Spree::OrderMailer, :type => :mailer do
+describe Spree::OrderMailer, type: :mailer do
   include EmailSpec::Helpers
   include EmailSpec::Matchers
 
   let(:order) do
     order = create(:order)
-    product = stub_model(Spree::Product, :name => %Q{The "BEST" product})
-    variant = stub_model(Spree::Variant, :product => product)
-    price = stub_model(Spree::Price, :variant => variant, :amount => 5.00)
+    product = stub_model(Spree::Product, name: %{The "BEST" product})
+    variant = stub_model(Spree::Variant, product: product)
+    price = stub_model(Spree::Price, variant: variant, amount: 5.00)
     store = FactoryGirl.build :store, mail_from_address: "store@example.com"
-    line_item = stub_model(Spree::LineItem, :variant => variant, :order => order, :quantity => 1, :price => 4.99)
-    allow(variant).to receive_messages(:default_price => price)
-    allow(order).to receive_messages(:line_items => [line_item])
+    line_item = stub_model(Spree::LineItem, variant: variant, order: order, quantity: 1, price: 4.99)
+    allow(variant).to receive_messages(default_price: price)
+    allow(order).to receive_messages(line_items: [line_item])
     allow(order).to receive(:store).and_return(store)
     order
   end
@@ -92,12 +92,11 @@ describe Spree::OrderMailer, :type => :mailer do
   end
 
   context "emails must be translatable" do
-
     context "pt-BR locale" do
       before do
         I18n.enforce_available_locales = false
-        pt_br_confirm_mail = { :spree => { :order_mailer => { :confirm_email => { :dear_customer => 'Caro Cliente,' } } } }
-        pt_br_cancel_mail = { :spree => { :order_mailer => { :cancel_email => { :order_summary_canceled => 'Resumo da Pedido [CANCELADA]' } } } }
+        pt_br_confirm_mail = { spree: { order_mailer: { confirm_email: { dear_customer: 'Caro Cliente,' } } } }
+        pt_br_cancel_mail = { spree: { order_mailer: { cancel_email: { order_summary_canceled: 'Resumo da Pedido [CANCELADA]' } } } }
         I18n.backend.store_translations :'pt-BR', pt_br_confirm_mail
         I18n.backend.store_translations :'pt-BR', pt_br_cancel_mail
         I18n.locale = :'pt-BR'
@@ -131,5 +130,4 @@ describe Spree::OrderMailer, :type => :mailer do
       expect(message.body).to be_blank
     end
   end
-
 end

data/spec/mailers/reimbursement_mailer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'email_spec'
 
-describe Spree::ReimbursementMailer, :type => :mailer do
+describe Spree::ReimbursementMailer, type: :mailer do
   include EmailSpec::Helpers
   include EmailSpec::Matchers
 
@@ -18,7 +18,7 @@ describe Spree::ReimbursementMailer, :type => :mailer do
       context "pt-BR locale" do
         before do
           I18n.enforce_available_locales = false
-          pt_br_shipped_email = { :spree => { :reimbursement_mailer => { :reimbursement_email => { :dear_customer => 'Caro Cliente,' } } } }
+          pt_br_shipped_email = { spree: { reimbursement_mailer: { reimbursement_email: { dear_customer: 'Caro Cliente,' } } } }
           I18n.backend.store_translations :'pt-BR', pt_br_shipped_email
           I18n.locale = :'pt-BR'
         end

data/spec/mailers/test_mailer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'email_spec'
 
-describe Spree::TestMailer, :type => :mailer do
+describe Spree::TestMailer, type: :mailer do
   include EmailSpec::Helpers
   include EmailSpec::Matchers
 

data/spec/models/spree/ability_spec.rb

@@ -7,7 +7,7 @@ require 'spree/testing_support/bar_ability'
 class FooAbility
   include CanCan::Ability
 
-  def initialize(user)
+  def initialize(_user)
     # allow anyone to perform index on Order
     can :index, Spree::Order
     # allow anyone to update an Order with id of 1
@@ -17,7 +17,7 @@ class FooAbility
   end
 end
 
-describe Spree::Ability, :type => :model do
+describe Spree::Ability, type: :model do
   let(:user) { build(:user) }
   let(:ability) { Spree::Ability.new(user) }
   let(:token) { nil }
@@ -45,7 +45,7 @@ describe Spree::Ability, :type => :model do
 
     it 'should apply the registered abilities permissions' do
       Spree::Ability.register_ability(FooAbility)
-      expect(Spree::Ability.new(user).can?(:update, mock_model(Spree::Order, user: nil, :id => 1))).to be true
+      expect(Spree::Ability.new(user).can?(:update, mock_model(Spree::Order, user: nil, id: 1))).to be true
     end
   end
 
@@ -110,7 +110,7 @@ describe Spree::Ability, :type => :model do
         # ability.should_not be_able_to :create, resource_user # Fails
         # It can create new users if is has access to the :admin, User!!
 
-        # TODO change the Ability class so only users and customers get the extra premissions?
+        # TODO: change the Ability class so only users and customers get the extra premissions?
 
         Spree::Ability.remove_ability(BarAbility)
       end
@@ -127,7 +127,6 @@ describe Spree::Ability, :type => :model do
   end
 
   context 'as Guest User' do
-
     context 'for Country' do
       let(:resource) { Spree::Country.new }
       context 'requested by any user' do
@@ -270,7 +269,5 @@ describe Spree::Ability, :type => :model do
         it_should_behave_like 'read only'
       end
     end
-
   end
-
 end