solidus_core 2.9.6 → 2.10.0.beta1

data/config/locales/en.yml

@@ -163,8 +163,11 @@ en:
         type: Type
       spree/price:
         amount: Price
+        country: Country
         currency: Currency
         is_default: Currently Valid
+        price: Price
+        variant: Variant
       spree/product:
         available_on: Available On
         cost_currency: Cost Currency
@@ -200,6 +203,7 @@ en:
         starts_at: Start
         status: Status
         usage_limit: Usage Limit
+        uses: Uses
       spree/promotion/actions/create_adjustment:
         description: Creates a promotion credit adjustment on the order
       spree/promotion/actions/create_item_adjustments:
@@ -238,7 +242,17 @@ en:
       spree/promotion/rules/user_role:
         description: Order includes User with specified Role(s)
       spree/promotion_category:
+        code: Code
         name: Name
+      spree/promotion_code:
+        value: Value
+      spree/promotion_code_batch:
+        base_code: Base code
+        email: Email
+        join_characters: Join characters
+        number_of_codes: Number of codes
+        status: Status
+        total_codes: Total codes
       spree/property:
         name: Name
         presentation: Presentation
@@ -250,6 +264,7 @@ en:
         active: Active
         code: Code
         name: Name
+        state: State
       spree/reimbursement:
         created_at: Date/Time
         number: Number
@@ -294,6 +309,7 @@ en:
         name: Name
       spree/shipping_method:
         admin_name: Internal Name
+        available_to_users: Available to users
         carrier: Carrier
         code: Code
         display_on: Display
@@ -326,6 +342,7 @@ en:
         phone: Phone
         propagate_all_variants: Propagate All Variants
         restock_inventory: Restock Inventory
+        state: State
         state_id: State
         zipcode: Zip
       spree/stock_movement:
@@ -358,6 +375,9 @@ en:
         action: Action
         amount_remaining: Total Unused
         user_total_amount: Total Amount
+      spree/store_credit_reason:
+        name: Name
+        state: State
       spree/store_credit_update_reason:
         name: Name
       spree/tax_category:
@@ -372,6 +392,7 @@ en:
         name: Name
         show_rate_in_label: Show Rate in Label
         starts_at: Start Date
+        tax_categories: Tax Categories
       spree/taxon:
         description: Description
         icon: Icon
@@ -1923,7 +1944,6 @@ en:
     select: Select
     select_a_reason: Select a reason
     select_a_stock_location: Select a stock location
-    select_stock: Select stock
     selected_quantity_not_available: selected of %{item} is not available.
     send_copy_of_all_mails_to: Send Copy of All Mails To
     send_mailer: Send Mailer
@@ -2202,8 +2222,7 @@ en:
     you_cannot_undo_action: You will not be able to undo this action
     you_have_no_orders_yet: You have no orders yet
     your_cart_is_empty: Your cart is empty
-    your_order_is_empty_add_product: Your order is empty, please search for and add
-      a product above
+    your_order_is_empty_add_product: Your order is empty. Please add products first.
     zip: Zip
     zipcode: Zip Code
     zone: Zone

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

@@ -42,6 +42,8 @@ module Spree
       opts[:skip_spring] = true
       opts[:skip_test] = true
       opts[:skip_yarn] = true
+      opts[:skip_bootsnap] = true
+      opts[:skip_webpack_install] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,

data/lib/generators/spree/install/install_generator.rb

@@ -58,9 +58,6 @@ module Spree
 
     def setup_assets
       @lib_name = 'spree'
-
-      empty_directory 'app/assets/images'
-
       %w{javascripts stylesheets images}.each do |path|
         empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
         empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -31,30 +31,16 @@ module Spree
         end
 
         def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes
-        end
-
-        def permitted_checkout_address_attributes
-          permitted_attributes.checkout_address_attributes
-        end
-
-        def permitted_checkout_delivery_attributes
-          permitted_attributes.checkout_delivery_attributes
-        end
-
-        def permitted_checkout_payment_attributes
-          permitted_attributes.checkout_payment_attributes
-        end
-
-        def permitted_checkout_confirm_attributes
-          permitted_attributes.checkout_confirm_attributes
+          permitted_attributes.checkout_attributes + [
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes,
+            payments_attributes: permitted_payment_attributes,
+            shipments_attributes: permitted_shipment_attributes
+          ]
         end
 
         def permitted_order_attributes
-          permitted_checkout_address_attributes +
-          permitted_checkout_delivery_attributes +
-          permitted_checkout_payment_attributes +
-          permitted_checkout_confirm_attributes + [
+          permitted_checkout_attributes + [
             line_items_attributes: permitted_line_item_attributes
           ]
         end

data/lib/spree/core/environment_extension.rb

@@ -22,15 +22,6 @@ module Spree
           end
         end
       end
-
-      def add_class(name)
-        Spree::Deprecation.warn(
-          'This method is deprecated. ' \
-          "Please use `#{self.class}.add_class_set(#{name.inspect})` instead.",
-          caller,
-        )
-        singleton_class.send(:add_class_set, name)
-      end
     end
   end
 end

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

@@ -29,7 +29,7 @@ module Spree
 
             completed_at = params.delete(:completed_at)
 
-            order.update_attributes!(params)
+            order.update!(params)
 
             order.create_proposed_shipments unless shipments_attrs.present?
 
@@ -104,7 +104,7 @@ module Spree
             line_item = order.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
             # Raise any errors with saving to prevent import succeeding with line items failing silently.
             if extra_params.present?
-              line_item.update_attributes!(extra_params)
+              line_item.update!(extra_params)
             else
               line_item.save!
             end
@@ -133,8 +133,7 @@ module Spree
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
             payment.state = p[:state] || p[:status] || 'completed'
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
-            source_attributes = p[:source] || p[:source_attributes]
-            payment.source = create_source_payment_from_params(source_attributes, payment) if source_attributes
+            payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
           end
         end

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

@@ -28,11 +28,11 @@ module Spree
         end
 
         def update
-          if product.update_attributes(product_attrs)
+          if product.update(product_attrs)
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
               if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update_attributes(variant_attribute)
+                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
                 product.variants.create({ product: product }.merge(variant_attribute))

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.9.6"
+  VERSION = "2.10.0.beta1"
 
   def self.solidus_version
     VERSION

data/lib/spree/permission_sets/default_customer.rb

@@ -8,7 +8,7 @@ module Spree
         can :display, OptionType
         can :display, OptionValue
         can :create, Order
-        can [:read, :update], Order do |order, token|
+        can [:read, :update], Order, Order.where(user: user) do |order, token|
           order.user == user || (order.guest_token.present? && token == order.guest_token)
         end
         cannot :update, Order do |order|

data/lib/spree/permitted_attributes.rb

@@ -8,10 +8,7 @@ module Spree
     ATTRIBUTES = [
       :address_attributes,
       :address_book_attributes,
-      :checkout_address_attributes,
-      :checkout_delivery_attributes,
-      :checkout_payment_attributes,
-      :checkout_confirm_attributes,
+      :checkout_attributes,
       :credit_card_update_attributes,
       :customer_return_attributes,
       :image_attributes,
@@ -48,6 +45,10 @@ module Spree
 
     @@address_book_attributes = address_attributes + [:default]
 
+    @@checkout_attributes = [
+      :coupon_code, :email, :special_instructions, :use_billing
+    ]
+
     @@credit_card_update_attributes = [
       :month, :year, :expiry, :first_name, :last_name, :name
     ]
@@ -90,7 +91,7 @@ module Spree
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data,
-      :existing_card_id, :wallet_payment_source_id, address_attributes: address_attributes
+      :existing_card_id, :wallet_payment_source_id
     ]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -128,75 +129,5 @@ module Spree
       :product_id, :product, :option_values_attributes, :price,
       :weight, :height, :width, :depth, :sku, :cost_currency, option_value_ids: [], options: [:name, :value]
     ]
-
-    @@checkout_address_attributes = [
-      :use_billing,
-      :email,
-      bill_address_attributes: address_attributes,
-      ship_address_attributes: address_attributes
-    ]
-
-    @@checkout_delivery_attributes = [
-      :special_instructions,
-      shipments_attributes: shipment_attributes
-    ]
-
-    @@checkout_payment_attributes = [
-      :coupon_code,
-      payments_attributes: payment_attributes + [
-        source_attributes: source_attributes
-      ]
-    ]
-
-    @@checkout_confirm_attributes = []
-
-    def self.checkout_attributes
-      Spree::Deprecation.warn <<-WARN.squish, caller
-        checkout_attributes is deprecated, please use the permitted
-        attributes set for the specific step that needs to be updated.
-
-        E.g. permitted_checkout_address_attributes
-      WARN
-
-      CheckoutAdditionalAttributes.new(
-        checkout_address_attributes +
-        checkout_delivery_attributes +
-        checkout_payment_attributes +
-        checkout_confirm_attributes
-      )
-    end
-  end
-
-  class CheckoutAdditionalAttributes < Array
-    def <<(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :<<)
-    end
-
-    def push(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :push)
-    end
-    alias append push
-
-    def prepend(*attributes)
-      super
-
-      inject_attributes_to_all_steps(attributes, :prepend)
-    end
-    alias unshift prepend
-
-    private
-
-    def inject_attributes_to_all_steps(attributes, method)
-      attributes.each do |attribute|
-        PermittedAttributes.checkout_address_attributes.send(method, attribute)
-        PermittedAttributes.checkout_delivery_attributes.send(method, attribute)
-        PermittedAttributes.checkout_payment_attributes.send(method, attribute)
-        PermittedAttributes.checkout_confirm_attributes.send(method, attribute)
-      end
-    end
   end
 end

data/lib/spree/testing_support/dummy_app/rake_tasks.rb

@@ -38,8 +38,12 @@ namespace :db do
     # railties:install:migrations and then db:migrate.
     # Migrations should be run one directory at a time
     ActiveRecord::Migrator.migrations_paths.each do |path|
-      if defined?(ActiveRecord::MigrationContext)
-        # Rails >= 5.2
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        ActiveRecord::MigrationContext.new(
+          [path],
+          ActiveRecord::SchemaMigration
+        ).migrate
+      elsif Rails.gem_version >= Gem::Version.new('5.2.0')
         ActiveRecord::MigrationContext.new([path]).migrate
       else
         ActiveRecord::Migrator.migrate(path)

data/solidus_core.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.1', '< 5.3.x']
+    s.add_dependency rails_dep, ['>= 5.1', '< 7.0.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
-  s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
-  s.add_dependency 'cancancan', '~> 2.2'
+  s.add_dependency 'awesome_nested_set', '~> 3.2'
+  s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
@@ -39,5 +39,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'paperclip', ['>= 4.2', '< 6']
   s.add_dependency 'paranoia', '~> 2.4'
   s.add_dependency 'ransack', '~> 2.0'
-  s.add_dependency 'state_machines-activerecord', '~> 0.4'
+  s.add_dependency 'state_machines-activerecord', '~> 0.6'
 end

data/spec/lib/search/base_spec.rb

@@ -60,7 +60,11 @@ RSpec.describe Spree::Core::Search::Base do
                search: { "price_range_any" => ["Under $10.00", "$10.00 - $15.00"] } }
     searcher = Spree::Core::Search::Base.new(params)
     expect(searcher.send(:get_base_scope).to_sql).to match /<= 10/
-    expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10\.0 and 15\.0/i
+    else
+      expect(searcher.send(:get_base_scope).to_sql).to match /between 10 and 15/i
+    end
     expect(searcher.retrieve_products.count).to eq(2)
   end
 

data/spec/lib/search/variant_spec.rb

@@ -85,7 +85,7 @@ module Spree
           example.run
           described_class.search_terms = search_terms
         end
-        before { variant.update_attributes!(weight: 5000) }
+        before { variant.update!(weight: 5000) }
 
         it { assert_found("5000", variant) }
       end

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

@@ -23,14 +23,7 @@ RSpec.describe Spree::Core::ControllerHelpers::StrongParameters, type: :controll
 
   describe '#permitted_checkout_attributes' do
     it 'returns Array class' do
-      Spree::Deprecation.silence do
-        expect(controller.permitted_checkout_attributes.class).to eq Spree::CheckoutAdditionalAttributes
-      end
-    end
-
-    it 'is deprecated' do
-      expect(Spree::Deprecation).to receive(:warn)
-      controller.permitted_checkout_attributes
+      expect(controller.permitted_checkout_attributes.class).to eq Array
     end
   end
 

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'spree/core/environment_extension'
 
 RSpec.describe Spree::Core::EnvironmentExtension do
-  let(:base) { Class.new { def self.to_s; 'ExampleClass'; end } }
+  let(:base) { Class.new }
   subject! { base.include(described_class).new }
 
   describe '.add_class_set' do
@@ -32,15 +32,4 @@ RSpec.describe Spree::Core::EnvironmentExtension do
       end
     end
   end
-
-  describe '#add_class' do
-    it 'is deprecated' do
-      expect(Spree::Deprecation).to receive(:warn) do |message, _caller|
-        expect(message).to include('ExampleClass.add_class_set(:foo)')
-      end
-      expect(base).to receive(:add_class_set).with(:foo)
-
-      base.new.add_class(:foo)
-    end
-  end
 end

data/spec/lib/spree/event_spec.rb

@@ -18,14 +18,26 @@ RSpec.describe Spree::Event do
     before do
       # ActiveSupport::Notifications does not provide an interface to clean all
       # subscribers at once, so some low level brittle code is required
-      @old_subscribers = notifier.instance_variable_get('@subscribers').dup
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        @old_string_subscribers = notifier.instance_variable_get('@string_subscribers').dup
+        @old_other_subscribers = notifier.instance_variable_get('@other_subscribers').dup
+        notifier.instance_variable_get('@string_subscribers').clear
+        notifier.instance_variable_get('@other_subscribers').clear
+      else
+        @old_subscribers = notifier.instance_variable_get('@subscribers').dup
+        notifier.instance_variable_get('@subscribers').clear
+      end
       @old_listeners = notifier.instance_variable_get('@listeners_for').dup
-      notifier.instance_variable_get('@subscribers').clear
       notifier.instance_variable_get('@listeners_for').clear
     end
 
     after do
-      notifier.instance_variable_set '@subscribers', @old_subscribers
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        notifier.instance_variable_set '@string_subscribers', @old_string_subscribers
+        notifier.instance_variable_set '@other_subscribers', @old_other_subscribers
+      else
+        notifier.instance_variable_set '@subscribers', @old_subscribers
+      end
       notifier.instance_variable_set '@listeners_for', @old_listeners
     end
 

data/spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb

@@ -6,8 +6,12 @@ require Spree::Core::Engine.root.join('db/migrate/20190106184413_remove_code_fro
 RSpec.describe RemoveCodeFromSpreePromotions do
   let(:migrations_paths) { ActiveRecord::Migrator.migrations_paths }
   let(:migrations) do
-    if ActiveRecord::Base.connection.respond_to?(:migration_context)
-      # Rails >= 5.2
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
+      ActiveRecord::MigrationContext.new(
+        migrations_paths,
+        ActiveRecord::SchemaMigration
+      ).migrations
+    elsif Rails.gem_version >= Gem::Version.new('5.2.0')
       ActiveRecord::MigrationContext.new(migrations_paths).migrations
     else
       ActiveRecord::Migrator.migrations(migrations_paths)
@@ -16,7 +20,13 @@ RSpec.describe RemoveCodeFromSpreePromotions do
   let(:previous_version) { 20180710170104 }
   let(:current_version) { 20190106184413 }
 
-  subject { ActiveRecord::Migrator.new(:up, migrations, current_version).migrate }
+  subject do
+    if Rails.gem_version >= Gem::Version.new('6.0.0')
+      ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, current_version).migrate
+    else
+      ActiveRecord::Migrator.new(:up, migrations, current_version).migrate
+    end
+  end
 
   # This is needed for MySQL since it is not able to rollback to the previous
   # state when database schema changes within that transaction.
@@ -28,7 +38,11 @@ RSpec.describe RemoveCodeFromSpreePromotions do
     # Silence migrations output in specs report.
     ActiveRecord::Migration.suppress_messages do
       # Migrate back to the previous version
-      ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
+      if Rails.gem_version >= Gem::Version.new('6.0.0')
+        ActiveRecord::Migrator.new(:down, migrations, ActiveRecord::SchemaMigration, previous_version).migrate
+      else
+        ActiveRecord::Migrator.new(:down, migrations, previous_version).migrate
+      end
       # If other tests using Spree::Promotion ran before this one, Rails has
       # stored information about table's columns and we need to reset those
       # since the migration changed the database structure.

data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Spree::Calculator::Returns::DefaultRefundAmount, type: :model do
           source_type: 'Spree::Order'
         )
 
-        order.adjustments.first.update_attributes(amount: adjustment_amount)
+        order.adjustments.first.update(amount: adjustment_amount)
       end
 
       it 'will return the line item amount deducted of refund' do

data/spec/models/spree/carton_spec.rb

@@ -73,8 +73,8 @@ RSpec.describe Spree::Carton do
     let(:email) { 'something@something.com' }
 
     before do
-      first_order.update_attributes!(email: email)
-      second_order.update_attributes!(email: email)
+      first_order.update!(email: email)
+      second_order.update!(email: email)
     end
 
     it "returns a unique list of the order emails it is associated to" do

data/spec/models/spree/concerns/user_methods_spec.rb

@@ -76,19 +76,19 @@ RSpec.describe Spree::UserMethods do
       it { is_expected.to eq(100 + 200) }
 
       context 'when some has been used' do
-        before { credit_1.update_attributes!(amount_used: 35) }
+        before { credit_1.update!(amount_used: 35) }
 
         it { is_expected.to eq(100 + 200 - 35) }
 
         context 'when some has been authorized' do
-          before { credit_1.update_attributes!(amount_authorized: 10) }
+          before { credit_1.update!(amount_authorized: 10) }
 
           it { is_expected.to eq(100 + 200 - 35 - 10) }
         end
       end
 
       context 'when some has been authorized' do
-        before { credit_1.update_attributes!(amount_authorized: 10) }
+        before { credit_1.update!(amount_authorized: 10) }
 
         it { is_expected.to eq(100 + 200 - 10) }
       end

data/spec/models/spree/credit_card_spec.rb

@@ -109,10 +109,10 @@ RSpec.describe Spree::CreditCard, type: :model do
     end
 
     it "should save and update addresses through nested attributes" do
-      persisted_card.update_attributes({ address_attributes: valid_address_attributes })
+      persisted_card.update({ address_attributes: valid_address_attributes })
       persisted_card.save!
       updated_attributes = { id: persisted_card.address.id, address1: "123 Main St." }
-      persisted_card.update_attributes({ address_attributes: updated_attributes })
+      persisted_card.update({ address_attributes: updated_attributes })
       expect(persisted_card.address.address1).to eq "123 Main St."
     end
   end

data/spec/models/spree/customer_return_spec.rb

@@ -233,7 +233,7 @@ RSpec.describe Spree::CustomerReturn, type: :model do
 
     context "it was not received" do
       before do
-        return_item.update_attributes!(reception_status: "lost_in_transit")
+        return_item.update!(reception_status: "lost_in_transit")
       end
 
       it 'should not updated inventory unit to returned' do

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

@@ -456,7 +456,7 @@ RSpec.describe Spree::Order, type: :model do
         order.line_items << FactoryBot.create(:line_item)
         order.line_items.first.variant.stock_items.each do |si|
           si.set_count_on_hand(0)
-          si.update_attributes(backorderable: false)
+          si.update(backorderable: false)
         end
 
         Spree::OrderUpdater.new(order).update

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

@@ -16,7 +16,7 @@ RSpec.describe "Outstanding balance integration tests" do
   let!(:order) { create(:order_with_line_items, line_items_count: 2, line_items_price: 3, shipment_cost: 13) }
   let(:item_1) { order.line_items[0] }
   let(:item_2) { order.line_items[1] }
-  before { order.update_attributes!(state: 'complete', completed_at: Time.now) }
+  before { order.update!(state: 'complete', completed_at: Time.now) }
 
   subject do
     order.reload
@@ -44,11 +44,11 @@ RSpec.describe "Outstanding balance integration tests" do
     end
 
     context 'when the order is cancelled' do
-      before { order.update_attributes!(state: "canceled") }
+      before { order.update!(state: "canceled") }
       it { should eq(-19) }
 
       context 'and the payment is voided' do
-        before { payment.update_attributes!(state: "void") }
+        before { payment.update!(state: "void") }
         it { should eq 0 }
       end
 
@@ -116,11 +116,11 @@ RSpec.describe "Outstanding balance integration tests" do
     end
 
     context 'when the order is cancelled' do
-      before { order.update_attributes!(state: "canceled") }
+      before { order.update!(state: "canceled") }
       it { should eq(-10) }
 
       context 'and the payment is voided' do
-        before { payment.update_attributes!(state: "void") }
+        before { payment.update!(state: "void") }
         it { should eq 0 }
       end
 

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

@@ -213,7 +213,7 @@ module Spree
         end
 
         context "for canceled orders" do
-          before { order.update_attributes(state: 'canceled') }
+          before { order.update(state: 'canceled') }
 
           it "it should be zero" do
             expect(order.total).to eq(110)

data/spec/models/spree/order_contents_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Spree::OrderContents, type: :model do
 
       context 'when the order does not have a taxable address' do
         before do
-          order.update_attributes!(ship_address: nil, bill_address: nil)
+          order.update!(ship_address: nil, bill_address: nil)
           expect(order.tax_address.country_id).to be_nil
         end