solidus_core 1.4.2 → 2.0.0.beta1

data/spec/models/spree/order_spec.rb

@@ -591,12 +591,16 @@ describe Spree::Order, type: :model do
 
   context "#apply_free_shipping_promotions" do
     it "calls out to the FreeShipping promotion handler" do
-      expect_any_instance_of(Spree::PromotionHandler::FreeShipping).to(
-        receive(:activate)
-      ).and_call_original
+      shipment = double('Shipment')
+      allow(order).to receive_messages shipments: [shipment]
+      expect(Spree::PromotionHandler::FreeShipping).to receive(:new).and_return(handler = double)
+      expect(handler).to receive(:activate)
 
-      expect(order.updater).to receive(:update).and_call_original
+      expect(Spree::ItemAdjustments).to receive(:new).with(shipment).and_return(adjuster = double)
+      expect(adjuster).to receive(:update)
 
+      expect(order.updater).to receive(:update_shipment_total)
+      expect(order.updater).to receive(:persist_totals)
       order.apply_free_shipping_promotions
     end
   end
@@ -1488,56 +1492,4 @@ describe Spree::Order, type: :model do
       end
     end
   end
-
-  describe "#validate_payments_attributes" do
-    let(:attributes) { [ActionController::Parameters.new(payment_method_id: payment_method.id)] }
-    subject do
-      order.validate_payments_attributes(attributes)
-    end
-
-    context "with empty array" do
-      let(:attributes) { [] }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with no payment method specified" do
-      let(:attributes) { [ActionController::Parameters.new({})] }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with valid payment method" do
-      let(:payment_method) { create(:check_payment_method) }
-      it "doesn't error" do
-        subject
-      end
-    end
-
-    context "with inactive payment method" do
-      let(:payment_method) { create(:check_payment_method, active: false) }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-
-    context "with unavailable payment method" do
-      let(:payment_method) { create(:check_payment_method, display_on: "back_end") }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-
-    context "with soft-deleted payment method" do
-      let(:payment_method) { create(:check_payment_method, deleted_at: Time.current) }
-
-      it "raises RecordNotFound" do
-        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-  end
 end

data/spec/models/spree/order_update_attributes_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 module Spree
   RSpec.describe OrderUpdateAttributes do
     let(:order) { create(:order) }
-    let(:payment_method) { create(:payment_method) }
     let(:request_env) { nil }
     let(:update) { described_class.new(order, attributes, request_env: request_env) }
 
@@ -26,10 +25,7 @@ module Spree
       let(:attributes) do
         {
           payments_attributes: [
-            {
-              payment_method_id: payment_method.id,
-              source_attributes: attributes_for(:credit_card)
-            }
+            { source_attributes: attributes_for(:credit_card) }
           ]
         }
       end

data/spec/models/spree/payment_spec.rb

@@ -655,13 +655,12 @@ describe Spree::Payment, type: :model do
     end
 
     context "completed orders" do
-      let(:payment_method) { create(:check_payment_method) }
       before { allow(order).to receive_messages completed?: true }
 
       it "updates payment_state and shipments" do
         expect(order.updater).to receive(:update_payment_state)
         expect(order.updater).to receive(:update_shipment_state)
-        Spree::Payment.create!(amount: 100, order: order, payment_method: payment_method)
+        Spree::Payment.create(amount: 100, order: order)
       end
     end
 

data/spec/models/spree/preferences/preferable_spec.rb

@@ -224,7 +224,7 @@ describe Spree::Preferences::Preferable, type: :model do
 
   describe "persisted preferables" do
     before(:all) do
-      class CreatePrefTest < ActiveRecord::Migration
+      class CreatePrefTest < ActiveRecord::Migration[4.2]
         def self.up
           create_table :pref_tests do |t|
             t.string :col
@@ -237,8 +237,8 @@ describe Spree::Preferences::Preferable, type: :model do
         end
       end
 
-      @migration_verbosity = ActiveRecord::Migration.verbose
-      ActiveRecord::Migration.verbose = false
+      @migration_verbosity = ActiveRecord::Migration[4.2].verbose
+      ActiveRecord::Migration[4.2].verbose = false
       CreatePrefTest.migrate(:up)
 
       class PrefTest < Spree::Base
@@ -249,7 +249,7 @@ describe Spree::Preferences::Preferable, type: :model do
 
     after(:all) do
       CreatePrefTest.migrate(:down)
-      ActiveRecord::Migration.verbose = @migration_verbosity
+      ActiveRecord::Migration[4.2].verbose = @migration_verbosity
     end
 
     before(:each) do

data/spec/models/spree/product_spec.rb

@@ -97,7 +97,6 @@ describe Spree::Product, type: :model do
           master = product.master
           master.default_price.price = 11
           master.save!
-          product.update_columns(updated_at: 1.day.ago)
           product.master.default_price.price = 12
         end
 
@@ -343,27 +342,19 @@ describe Spree::Product, type: :model do
 
     context "associations" do
       describe "product_option_types" do
-        context "with no existing option types" do
-          before { product.update_columns(updated_at: 1.day.ago) }
-
-          it "touches the product instance when an option type is added" do
-            expect {
-              product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
-            }.to change { product.reload.updated_at }
-          end
+        it "touches the product instance when an option type is added" do
+          expect {
+            product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
+            product.reload
+          }.to change { product.updated_at }
         end
 
-        context "with an existing option type" do
-          before do
-            product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
-            product.update_columns(updated_at: 1.day.ago)
-          end
-
-          it "touches product instance when an option type is removed" do
-            expect {
-              product.product_option_types = []
-            }.to change { product.reload.updated_at }
-          end
+        it "touches product instance when an option type is removed" do
+          product.product_option_types.create(option_type: create(:option_type, name: 'new-option-type'))
+          expect {
+            product.product_option_types = []
+            product.reload
+          }.to change { product.updated_at }
         end
       end
     end

data/spec/models/spree/stock_item_spec.rb

@@ -199,41 +199,30 @@ describe Spree::StockItem, type: :model do
 
       let(:inventory_cache_threshold) { 5 }
 
-      before do
-        subject.set_count_on_hand(existing_count_on_hand)
-        subject.variant.update_column(:updated_at, 1.day.ago)
+      it "count on hand falls below threshold" do
+        expect do
+          subject.set_count_on_hand(3)
+        end.to change { subject.variant.updated_at }
       end
 
-      context "beginning above threshold" do
-        let(:existing_count_on_hand) { 10 }
-
-        it "count on hand falls below threshold" do
-          expect do
-            subject.set_count_on_hand(3)
-          end.to change { subject.variant.updated_at }
-        end
-
-        it "count on hand stays above threshold" do
-          expect do
-            subject.set_count_on_hand(8)
-          end.not_to change { subject.variant.updated_at }
-        end
+      it "count on hand rises above threshold" do
+        subject.set_count_on_hand(2)
+        expect do
+          subject.set_count_on_hand(7)
+        end.to change { subject.variant.updated_at }
       end
 
-      context "beginning below threshold" do
-        let(:existing_count_on_hand) { 2 }
-
-        it "count on hand rises above threshold" do
-          expect do
-            subject.set_count_on_hand(7)
-          end.to change { subject.variant.updated_at }
-        end
+      it "count on hand stays below threshold" do
+        subject.set_count_on_hand(2)
+        expect do
+          subject.set_count_on_hand(3)
+        end.to change { subject.variant.updated_at }
+      end
 
-        it "count on hand stays below threshold" do
-          expect do
-            subject.set_count_on_hand(3)
-          end.to change { subject.variant.updated_at }
-        end
+      it "count on hand stays above threshold" do
+        expect do
+          subject.set_count_on_hand(8)
+        end.not_to change { subject.variant.updated_at }
       end
     end
 
@@ -266,8 +255,6 @@ describe Spree::StockItem, type: :model do
   end
 
   describe "#after_touch" do
-    before { subject.variant.update_column(:updated_at, 1.day.ago) }
-
     it "touches its variant" do
       expect do
         subject.touch

data/spec/models/spree/store_credit_spec.rb

@@ -838,10 +838,10 @@ describe Spree::StoreCredit do
     subject { store_credit.invalidate(invalidation_reason, invalidation_user) }
 
     it "sets the invalidated_at field to the current time" do
-      invalidated_at = 2.minutes.from_now
+      invalidated_at = Time.current
       Timecop.freeze(invalidated_at) do
         subject
-        expect(store_credit.invalidated_at).to be_within(1.second).of invalidated_at
+        expect(store_credit.invalidated_at).to eq invalidated_at
       end
     end
 

data/spec/models/spree/tax/item_adjuster_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Spree::Tax::ItemAdjuster do
   subject(:adjuster) { described_class.new(item) }
-  let(:order) { create(:order) }
+  let(:order) { Spree::Order.new }
   let(:item) { Spree::LineItem.new(order: order) }
 
   before do
@@ -64,6 +64,7 @@ RSpec.describe Spree::Tax::ItemAdjuster do
           before { allow(item).to receive(:tax_category).and_return(item_tax_category) }
 
           it 'creates an adjustment for every matching rate' do
+            expect(rate_1).to receive_message_chain(:adjustments, :create!)
             expect(adjuster.adjust!.length).to eq(1)
           end
         end

data/spec/models/spree/tax/order_adjuster_spec.rb

@@ -31,6 +31,7 @@ RSpec.describe Spree::Tax::OrderAdjuster do
                                               rates_for_order_zone: rates_for_order_zone,
                                               rates_for_default_zone: [],
                                               order_tax_zone: zone,
+                                              skip_destroy_adjustments: true
                                             ).and_return(item_adjuster)
       expect(Spree::Tax::ItemAdjuster).to receive(:new).
                                             with(
@@ -38,6 +39,7 @@ RSpec.describe Spree::Tax::OrderAdjuster do
                                               rates_for_order_zone: rates_for_order_zone,
                                               rates_for_default_zone: [],
                                               order_tax_zone: zone,
+                                              skip_destroy_adjustments: true
                                             ).and_return(item_adjuster)
 
       expect(item_adjuster).to receive(:adjust!).twice

data/spec/spec_helper.rb

@@ -37,6 +37,8 @@ require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
 require 'cancan/matchers'
 
+ActiveJob::Base.queue_adapter = :inline
+
 RSpec.configure do |config|
   config.color = true
   config.infer_spec_type_from_file_location!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -182,20 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.0.pre
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -216,28 +210,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +252,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -1410,12 +1404,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.