solidus_core 1.4.2 → 2.0.0.beta1

data/db/migrate/20151117063249_convert_habtm_to_hmt_for_properties_prototypes.rb

@@ -1,4 +1,4 @@
-class ConvertHabtmToHmtForPropertiesPrototypes < ActiveRecord::Migration
+class ConvertHabtmToHmtForPropertiesPrototypes < ActiveRecord::Migration[4.2]
   def up
     add_column :spree_properties_prototypes, :id, :primary_key
     add_column :spree_properties_prototypes, :created_at, :datetime

data/db/migrate/20151124062500_convert_habtm_to_hmt_for_option_type_prototypes.rb

@@ -1,4 +1,4 @@
-class ConvertHabtmToHmtForOptionTypePrototypes < ActiveRecord::Migration
+class ConvertHabtmToHmtForOptionTypePrototypes < ActiveRecord::Migration[4.2]
   def up
     add_column :spree_option_types_prototypes, :id, :primary_key
     add_column :spree_option_types_prototypes, :created_at, :datetime

data/db/migrate/20151126063028_convert_habtm_to_hmt_for_taxons_promotion_rules.rb

@@ -1,4 +1,4 @@
-class ConvertHabtmToHmtForTaxonsPromotionRules < ActiveRecord::Migration
+class ConvertHabtmToHmtForTaxonsPromotionRules < ActiveRecord::Migration[4.2]
   def up
     add_column :spree_taxons_promotion_rules, :created_at, :datetime
     add_column :spree_taxons_promotion_rules, :updated_at, :datetime

data/db/migrate/20151219020209_add_stock_item_unique_index.rb

@@ -1,4 +1,4 @@
-class AddStockItemUniqueIndex < ActiveRecord::Migration
+class AddStockItemUniqueIndex < ActiveRecord::Migration[4.2]
   def change
     # Add a database-level uniqueness constraint for databases that support it
     # (postgres and sqlite > 3.8)

data/db/migrate/20160111091912_add_column_available_to_all_on_spree_shipping_method.rb

@@ -1,4 +1,4 @@
-class AddColumnAvailableToAllOnSpreeShippingMethod < ActiveRecord::Migration
+class AddColumnAvailableToAllOnSpreeShippingMethod < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_shipping_methods, :available_to_all, :boolean, default: true
   end

data/db/migrate/20160116133604_add_position_to_spree_payment_methods.rb

@@ -1,4 +1,4 @@
-class AddPositionToSpreePaymentMethods < ActiveRecord::Migration
+class AddPositionToSpreePaymentMethods < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_payment_methods, :position, :integer, default: 0
   end

data/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb

@@ -1,4 +1,4 @@
-class AddCarrierAndServiceLevelToSpreeShippingMethods < ActiveRecord::Migration
+class AddCarrierAndServiceLevelToSpreeShippingMethods < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_shipping_methods, :carrier, :string
     add_column :spree_shipping_methods, :service_level, :string

data/db/migrate/20160224201413_create_spree_shipping_rate_taxes.rb

@@ -1,4 +1,4 @@
-class CreateSpreeShippingRateTaxes < ActiveRecord::Migration
+class CreateSpreeShippingRateTaxes < ActiveRecord::Migration[4.2]
   def change
     create_table :spree_shipping_rate_taxes do |t|
       t.decimal :amount, precision: 8, scale: 2, default: 0.0, null: false

data/db/migrate/20160229133259_add_cart_tax_country_iso_to_spree_store.rb

@@ -1,4 +1,4 @@
-class AddCartTaxCountryIsoToSpreeStore < ActiveRecord::Migration
+class AddCartTaxCountryIsoToSpreeStore < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_stores, :cart_tax_country_iso, :string, null: true, default: nil
   end

data/db/migrate/20160301103333_remove_pre_tax_amount_on_line_item_and_shipment.rb

@@ -1,4 +1,4 @@
-class RemovePreTaxAmountOnLineItemAndShipment < ActiveRecord::Migration
+class RemovePreTaxAmountOnLineItemAndShipment < ActiveRecord::Migration[4.2]
   def change
     remove_column :spree_line_items, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
     remove_column :spree_shipments, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false

data/db/migrate/20160308000300_disallow_adjustment_finalized_nulls.rb

@@ -1,4 +1,4 @@
-class DisallowAdjustmentFinalizedNulls < ActiveRecord::Migration
+class DisallowAdjustmentFinalizedNulls < ActiveRecord::Migration[4.2]
   def up
     execute <<-SQL
       update spree_adjustments

data/db/migrate/20160318145302_add_timestamps_to_prices.rb

@@ -1,4 +1,4 @@
-class AddTimestampsToPrices < ActiveRecord::Migration
+class AddTimestampsToPrices < ActiveRecord::Migration[4.2]
   def change
     change_table(:spree_prices) { |t| t.timestamps null: true }
   end

data/db/migrate/20160330204846_add_missing_timestamp_columns.rb

@@ -1,4 +1,4 @@
-class AddMissingTimestampColumns < ActiveRecord::Migration
+class AddMissingTimestampColumns < ActiveRecord::Migration[4.2]
   def change
     # Missing updated_at
     add_column :friendly_id_slugs, :updated_at, :datetime, null: true

data/db/migrate/20160509181311_add_country_iso_to_prices.rb

@@ -1,4 +1,4 @@
-class AddCountryIsoToPrices < ActiveRecord::Migration
+class AddCountryIsoToPrices < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_prices, :country_iso, :string, null: true, limit: 2
 

data/db/migrate/20160527070401_rename_shipment_address_field.rb

@@ -1,4 +1,4 @@
-class RenameShipmentAddressField < ActiveRecord::Migration
+class RenameShipmentAddressField < ActiveRecord::Migration[4.2]
   def change
     change_table :spree_shipments do |t|
       t.rename :address_id, :deprecated_address_id

data/db/migrate/20160608162651_ensure_default_store.rb

@@ -1,4 +1,4 @@
-class EnsureDefaultStore < ActiveRecord::Migration
+class EnsureDefaultStore < ActiveRecord::Migration[4.2]
   class Store < ActiveRecord::Base
     self.table_name = 'spree_stores'
   end

data/db/migrate/20160608180751_ensure_store_on_orders.rb

@@ -1,4 +1,4 @@
-class EnsureStoreOnOrders < ActiveRecord::Migration
+class EnsureStoreOnOrders < ActiveRecord::Migration[4.2]
   class Store < ActiveRecord::Base
     self.table_name = 'spree_stores'
   end

data/db/migrate/20160616232103_remove_user_id_from_promotion_rules.rb

@@ -1,4 +1,4 @@
-class RemoveUserIdFromPromotionRules < ActiveRecord::Migration
+class RemoveUserIdFromPromotionRules < ActiveRecord::Migration[4.2]
   def up
     remove_index :spree_promotion_rules, name: 'index_promotion_rules_on_user_id'
     remove_column :spree_promotion_rules, :user_id

data/db/migrate/20160718205341_add_payment_id_index_to_spree_refunds.rb

@@ -1,4 +1,4 @@
-class AddPaymentIdIndexToSpreeRefunds < ActiveRecord::Migration
+class AddPaymentIdIndexToSpreeRefunds < ActiveRecord::Migration[4.2]
   def change
     add_index(:spree_refunds, :payment_id)
   end

data/db/migrate/20160718205859_add_reimbursement_id_index_to_spree_refunds.rb

@@ -1,4 +1,4 @@
-class AddReimbursementIdIndexToSpreeRefunds < ActiveRecord::Migration
+class AddReimbursementIdIndexToSpreeRefunds < ActiveRecord::Migration[4.2]
   def change
     add_index(:spree_refunds, :reimbursement_id)
   end

data/lib/generators/spree/custom_user/templates/migration.rb.tt

@@ -1,4 +1,4 @@
-class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration
+class AddSpreeFieldsToCustomUserTable < ActiveRecord::Migration[4.2]
   def up
     add_column <%= table_name.inspect %>, :spree_api_key, :string, :limit => 48
     add_column <%= table_name.inspect %>, :ship_address_id, :integer

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -48,6 +48,9 @@ module Spree
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
       template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
+
+      # FIXME: We aren't ready for rails 5 defaults
+      remove_file "#{dummy_path}/config/initializers/new_framework_defaults.rb"
     end
 
     def test_dummy_inject_extension_requirements
@@ -124,7 +127,7 @@ end
       core_gems = ["spree/core", "spree/api", "spree/backend", "spree/frontend"]
 
       if core_gems.include?(lib_name)
-        '../../../../Gemfile'
+        '../../../../../Gemfile'
       else
         '../../../../Gemfile'
       end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => "public, max-age=3600" }
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/lib/spree/core/importer/order.rb

@@ -3,6 +3,7 @@ module Spree
     module Importer
       class Order
         def self.import(user, params)
+          params = params.to_h
           ActiveRecord::Base.transaction do
             ensure_country_id_from_params params[:ship_address_attributes]
             ensure_state_id_from_params params[:ship_address_attributes]

data/lib/spree/core/importer/product.rb

@@ -7,8 +7,8 @@ module Spree
         def initialize(product, product_params, options = {})
           @product = product || Spree::Product.new(product_params)
 
-          @product_attrs = product_params
-          @variants_attrs = options[:variants_attrs] || []
+          @product_attrs = product_params.to_h
+          @variants_attrs = (options[:variants_attrs] || []).map(&:to_h)
           @options_attrs = options[:options_attrs] || []
         end
 

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.4.2"
+    "2.0.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/deprecation.rb

@@ -1,3 +1,3 @@
 module Spree
-  Deprecation = ActiveSupport::Deprecation.new('2.1', 'Solidus')
+  Deprecation = ActiveSupport::Deprecation.new('2.0', 'Solidus')
 end

data/lib/spree/testing_support/common_rake.rb

@@ -17,7 +17,7 @@ namespace :common do
 
     puts "Setting up dummy database..."
 
-    sh "bundle exec rake db:drop db:create db:migrate VERBOSE=false"
+    sh "bundle exec rake db:migrate VERBOSE=false"
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"

data/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -12,27 +12,22 @@ FactoryGirl.define do
     label 'Shipping'
     association(:source, factory: :tax_rate)
     eligible true
+  end
 
-    after(:build) do |adjustment|
-      adjustments = adjustment.adjustable.adjustments
-      if adjustments.loaded? && !adjustments.include?(adjustment)
-        adjustments.proxy_association.add_to_target(adjustment)
-      end
-    end
-
-    factory :tax_adjustment, class: Spree::Adjustment do
-      order { adjustable.order }
-      association(:adjustable, factory: :line_item)
-      amount 10.0
-      label 'VAT 5%'
+  factory :tax_adjustment, class: Spree::Adjustment do
+    order { adjustable.order }
+    association(:adjustable, factory: :line_item)
+    amount 10.0
+    label 'VAT 5%'
+    association(:source, factory: :tax_rate)
+    eligible true
 
-      after(:create) do |adjustment|
-        # Set correct tax category, so that adjustment amount is not 0
-        if adjustment.adjustable.is_a?(Spree::LineItem)
-          adjustment.source.tax_category = adjustment.adjustable.tax_category
-          adjustment.source.save
-          adjustment.update!
-        end
+    after(:create) do |adjustment|
+      # Set correct tax category, so that adjustment amount is not 0
+      if adjustment.adjustable.is_a?(Spree::LineItem)
+        adjustment.source.tax_category = adjustment.adjustable.tax_category
+        adjustment.source.save
+        adjustment.update!
       end
     end
   end

data/solidus_core.gemspec

@@ -30,12 +30,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.2'
-  s.add_dependency 'paranoia', '~> 2.1', '>= 2.1.4'
+  s.add_dependency 'paranoia', '~> 2.2.0.pre'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 4.2.5'
-  s.add_dependency 'ransack', '~> 1.6'
+  s.add_dependency 'rails', '~> 5.0.0'
+  s.add_dependency 'ransack', '~> 1.8'
   s.add_dependency 'responders'
-  s.add_dependency 'state_machines-activerecord', '~> 0.2'
+  s.add_dependency 'state_machines-activerecord', '~> 0.4'
   s.add_dependency 'stringex', '~> 1.5.1'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
   s.add_dependency 'twitter_cldr', '~> 3.0'

data/spec/lib/spree/core/controller_helpers/auth_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class FakesController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
-  def index; render text: 'index'; end
+  def index; render plain: 'index'; end
 end
 
 describe Spree::Core::ControllerHelpers::Auth, type: :controller do
@@ -33,7 +33,7 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
     controller(FakesController) do
       def index
         set_guest_token
-        render text: 'index'
+        render plain: 'index'
       end
     end
     it 'sends cookie header' do

data/spec/lib/tasks/order_capturing_spec.rb

@@ -18,7 +18,7 @@ describe "order_capturing:capture_payments" do
 
   context "with a mix of canceled and shipped inventory" do
     before do
-      Spree::OrderCancellations.new(order).short_ship([order.line_items.first.inventory_units.first])
+      Spree::OrderCancellations.new(order).short_ship([order.inventory_units.first])
       order.shipping.ship_shipment(order.shipments.first)
       order.update_attributes!(payment_state: 'balance_due')
     end

data/spec/models/spree/adjustment_spec.rb

@@ -14,8 +14,7 @@ describe Spree::Adjustment, type: :model do
     let(:adjustment) { Spree::Adjustment.create(label: "Adjustment", amount: 5, order: order, adjustable: line_item) }
 
     it 'touches the adjustable' do
-      line_item.update_columns(updated_at: 1.day.ago)
-      expect { adjustment.save! }.to change { line_item.updated_at }
+      expect { adjustment.save }.to change { line_item.updated_at }
     end
   end
 

data/spec/models/spree/credit_card_spec.rb

@@ -35,7 +35,7 @@ describe Spree::CreditCard, type: :model do
     allow(@payment).to receive_messages payment_method: @payment_gateway
   end
 
-  describe "#can_capture?" do
+  context "#can_capture?" do
     it "should be true if payment is pending" do
       payment = mock_model(Spree::Payment, pending?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
@@ -47,14 +47,14 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#can_void?" do
+  context "#can_void?" do
     it "should be true if payment is not void" do
       payment = mock_model(Spree::Payment, failed?: false, void?: false)
       expect(credit_card.can_void?(payment)).to be true
     end
   end
 
-  describe "#can_credit?" do
+  context "#can_credit?" do
     it "should be false if payment is not completed" do
       payment = mock_model(Spree::Payment, completed?: false)
       expect(credit_card.can_credit?(payment)).to be false
@@ -66,7 +66,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#valid?" do
+  context "#valid?" do
     it "should validate presence of number" do
       credit_card.attributes = valid_credit_card_attributes.except(:number)
       expect(credit_card).not_to be_valid
@@ -109,7 +109,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#save" do
+  context "#save" do
     before do
       credit_card.attributes = valid_credit_card_attributes
       credit_card.save!
@@ -145,7 +145,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#number=" do
+  context "#number=" do
     it "should strip non-numeric characters from card input" do
       credit_card.number = "6011000990139424"
       expect(credit_card.number).to eq("6011000990139424")
@@ -161,7 +161,7 @@ describe Spree::CreditCard, type: :model do
   end
 
   # Regression test for https://github.com/spree/spree/issues/3847 and https://github.com/spree/spree/issues/3896
-  describe "#expiry=" do
+  context "#expiry=" do
     it "can set with a 2-digit month and year" do
       credit_card.expiry = '04 / 15'
       expect(credit_card.month).to eq('4')
@@ -208,7 +208,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#cc_type=" do
+  context "#cc_type=" do
     it "converts between the different types" do
       credit_card.cc_type = 'mastercard'
       expect(credit_card.cc_type).to eq('master')
@@ -257,13 +257,13 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#associations" do
+  context "#associations" do
     it "should be able to access its payments" do
       credit_card.payments.to_a
     end
   end
 
-  describe "#first_name" do
+  context "#first_name" do
     before do
       credit_card.name = "Ludwig van Beethoven"
     end
@@ -273,7 +273,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#last_name" do
+  context "#last_name" do
     before do
       credit_card.name = "Ludwig van Beethoven"
     end
@@ -283,7 +283,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  describe "#to_active_merchant" do
+  context "#to_active_merchant" do
     before do
       credit_card.number = "4111111111111111"
       credit_card.year = Time.current.year

data/spec/models/spree/item_adjustments_spec.rb

@@ -272,9 +272,6 @@ module Spree
     context "multiple updates" do
       let(:adjustment) { create(:tax_adjustment, amount: -10) }
       let(:item) { adjustment.adjustable }
-      # we need to get this from the line item so that we're modifying the same
-      # tax rate that is cached by line_item.adjustments
-      let(:source) { item.adjustments.to_a.first.source }
 
       def update
         described_class.new(item).update
@@ -286,17 +283,18 @@ module Spree
       end
 
       it "persists each change" do
-        source.update_attributes!(amount: 0.1)
+        adjustment.source.update_attributes!(amount: 0.1)
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 1)
 
-        source.update_attributes!(amount: 0.20)
+        adjustment.source.update_attributes!(amount: 0.20)
+        item.reload
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 2)
 
-        source.update_attributes!(amount: 0.10)
+        adjustment.source.update_attributes!(amount: 0.10)
         update
         expect(item).not_to be_changed
         expect(db_record).to have_attributes(adjustment_total: 1)

data/spec/models/spree/order/checkout_spec.rb

@@ -868,10 +868,23 @@ describe Spree::Order, type: :model do
         end
       end
 
-      context 'callbacks halt' do
+      context 'callback returns false' do
         before do
           expect(order).to receive(:update_params_payment_source).and_return false
         end
+        it 'does not let through unpermitted attributes' do
+          expect(order).not_to receive(:assign_attributes)
+          expect(order).not_to receive(:save)
+          ActiveSupport::Deprecation.silence do
+            order.update_from_params(params, permitted_params)
+          end
+        end
+      end
+
+      context 'callback throws abort' do
+        before do
+          expect(order).to receive(:update_params_payment_source).and_throw :abort
+        end
         it 'does not let through unpermitted attributes' do
           expect(order).not_to receive(:assign_attributes)
           expect(order).not_to receive(:save)

data/spec/models/spree/order/payment_spec.rb

@@ -6,53 +6,49 @@ module Spree
     let(:updater) { Spree::OrderUpdater.new(order) }
 
     context "processing payments" do
-      let(:order) { create(:order_with_line_items, shipment_cost: 0, line_items_price: 100) }
       before do
         # So that Payment#purchase! is called during processing
         Spree::Config[:auto_capture] = true
+
+        allow(order).to receive_message_chain(:line_items, :empty?).and_return(false)
+        allow(order).to receive_messages total: 100
       end
 
       it 'processes all checkout payments' do
-        payment_1 = create(:payment, order: order, amount: 50)
-        payment_2 = create(:payment, order: order, amount: 50)
+        payment_1 = create(:payment, amount: 50)
+        payment_2 = create(:payment, amount: 50)
+        allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2])
 
         order.process_payments!
         updater.update_payment_state
-
         expect(order.payment_state).to eq('paid')
-        expect(order.payment_total).to eq(100)
 
-        expect(payment_1.reload).to be_completed
-        expect(payment_2.reload).to be_completed
+        expect(payment_1).to be_completed
+        expect(payment_2).to be_completed
       end
 
       it 'does not go over total for order' do
-        payment_1 = create(:payment, order: order, amount: 50)
-        payment_2 = create(:payment, order: order, amount: 50)
-        payment_3 = create(:payment, order: order, amount: 50)
+        payment_1 = create(:payment, amount: 50)
+        payment_2 = create(:payment, amount: 50)
+        payment_3 = create(:payment, amount: 50)
+        allow(order).to receive(:unprocessed_payments).and_return([payment_1, payment_2, payment_3])
 
         order.process_payments!
         updater.update_payment_state
-
         expect(order.payment_state).to eq('paid')
-        expect(order.payment_total).to eq(100)
 
-        expect(payment_1.reload).to be_completed
-        expect(payment_2.reload).to be_completed
-        expect(payment_3.reload).to be_checkout
+        expect(payment_1).to be_completed
+        expect(payment_2).to be_completed
+        expect(payment_3).to be_checkout
       end
 
       it "does not use failed payments" do
-        create(:payment, order: order, amount: 50)
-        create(:payment, order: order, amount: 50, state: 'failed')
-        order.payments.reload
+        payment_1 = create(:payment, amount: 50)
+        payment_2 = create(:payment, amount: 50, state: 'failed')
 
-        expect(order.payments[0]).to receive(:process!).and_call_original
-        expect(order.payments[1]).not_to receive(:process!)
+        expect(payment_2).not_to receive(:process!)
 
         order.process_payments!
-
-        expect(order.payment_total).to eq(50)
       end
     end
 

data/spec/models/spree/order_cancellations_spec.rb

@@ -139,9 +139,9 @@ describe Spree::OrderCancellations do
         order.contents.add(line_item.variant)
 
         # make the total $1.67 so it divides unevenly
-        line_item.adjustments.create!(
-          source_type: 'Spree::TaxRate',
+        Spree::Adjustment.tax.create!(
           order: order,
+          adjustable: line_item,
           amount: 0.01,
           label: 'some fake tax',
           finalized: true

data/spec/models/spree/order_capturing_spec.rb

@@ -4,8 +4,8 @@ describe Spree::OrderCapturing do
   describe '#capture_payments' do
     subject { Spree::OrderCapturing.new(order, payment_methods).capture_payments }
 
-    # Regression for https://github.com/solidusio/solidus/pull/407
-    # See also https://github.com/solidusio/solidus/pull/1406
+    # Regression for the order.update! in the ensure block.
+    # See the comment there.
     context "updating the order" do
       let(:order) { create :completed_order_with_totals }
       let(:payment_methods) { [] }

data/spec/models/spree/order_shipping_spec.rb

@@ -30,7 +30,7 @@ describe Spree::OrderShipping do
 
     it "updates shipment.shipped_at" do
       Timecop.freeze do |now|
-        expect { subject }.to change { shipment.shipped_at }.from(nil).to be_within(1.second).of(now)
+        expect { subject }.to change { shipment.shipped_at }.from(nil).to(now)
       end
     end
 
@@ -40,7 +40,7 @@ describe Spree::OrderShipping do
         Timecop.freeze(future) do
           subject
         end
-      end.to change { order.updated_at }.to be_within(1.second).of(future)
+      end.to change { order.updated_at }.from(order.updated_at).to(future)
     end
   end