solidus_core 2.3.1 → 2.4.0.beta1

data/spec/models/spree/stock_transfer_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Spree
-  describe StockTransfer, type: :model do
+  RSpec.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 }

data/spec/models/spree/store_credit_category_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::StoreCreditCategory, type: :model do
+RSpec.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,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::StoreCreditEvent do
+RSpec.describe Spree::StoreCreditEvent do
   describe ".exposed_events" do
     [
       Spree::StoreCredit::ELIGIBLE_ACTION,

data/spec/models/spree/store_credit_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::StoreCredit do
+RSpec.describe Spree::StoreCredit do
   let(:currency) { "TEST" }
   let(:store_credit) { build(:store_credit, store_credit_attrs) }
   let(:store_credit_attrs) { {} }

data/spec/models/spree/store_selector/by_server_name_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::StoreSelector::ByServerName do
+RSpec.describe Spree::StoreSelector::ByServerName do
   describe "#store" do
     subject { described_class.new(request).store }
 

data/spec/models/spree/store_selector/legacy_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::StoreSelector::Legacy do
+RSpec.describe Spree::StoreSelector::Legacy do
   describe "#store" do
     subject { described_class.new(request).store }
 

data/spec/models/spree/store_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Store, type: :model do
+RSpec.describe Spree::Store, type: :model do
   it { is_expected.to respond_to(:cart_tax_country_iso) }
 
   describe ".by_url (deprecated)" do

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Spree::Tax::OrderAdjuster do
   subject(:adjuster) { described_class.new(order) }

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

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Tax::ShippingRateTaxer do
+RSpec.describe Spree::Tax::ShippingRateTaxer do
   let(:shipping_rate) { build_stubbed(:shipping_rate) }
 
   subject(:taxer) { described_class.new(shipping_rate) }

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Spree::Tax::TaxLocation do
   let(:country) { build_stubbed(:country) }

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe "Taxation system integration tests" do
   let(:order) { create :order, ship_address: shipping_address, state: "delivery" }
@@ -52,7 +52,6 @@ RSpec.describe "Taxation system integration tests" do
 
   context 'selling from germany' do
     let(:germany) { create :country, iso: "DE" }
-    # The weird default_tax boolean is what makes this context one with default included taxes
     let!(:germany_zone) { create :zone, countries: [germany] }
     let(:romania) { create(:country, iso: "RO") }
     let(:romania_zone) { create(:zone, countries: [romania] ) }
@@ -283,7 +282,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(18.69)
         end
       end
 
@@ -321,7 +320,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(25.21)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(25.21)
         end
       end
 
@@ -359,7 +358,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(8.40)
         end
       end
 
@@ -410,7 +409,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(18.69)
         end
       end
     end
@@ -443,7 +442,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(18.69)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(18.69)
         end
 
         context 'an order with a book and a shipment' do
@@ -485,7 +484,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(25.21)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(25.21)
         end
 
         context 'an order with a sweater and a shipment' do
@@ -527,7 +526,7 @@ RSpec.describe "Taxation system integration tests" do
         end
 
         it 'has a constant amount pre tax' do
-          expect(line_item.discounted_amount - line_item.included_tax_total).to eq(8.40)
+          expect(line_item.total_before_tax - line_item.included_tax_total).to eq(8.40)
         end
       end
 
@@ -663,7 +662,7 @@ RSpec.describe "Taxation system integration tests" do
         context 'when tax address is later cleared' do
           before do
             order.ship_address = nil
-            order.update!
+            order.recalculate
           end
 
           it 'removes all tax adjustments' do

data/spec/models/spree/tax_calculator/default_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Spree::TaxCalculator::Default do
   let(:shipping_address) { FactoryGirl.create(:address, state: new_york) }

data/spec/models/spree/tax_category_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::TaxCategory, type: :model do
+RSpec.describe Spree::TaxCategory, type: :model do
   context 'default tax category' do
     let(:tax_category) { create(:tax_category) }
     let(:new_tax_category) { create(:tax_category) }

data/spec/models/spree/tax_rate_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::TaxRate, type: :model do
+RSpec.describe Spree::TaxRate, type: :model do
   it { is_expected.to respond_to(:shipping_rate_taxes) }
 
   context '.for_address' do
@@ -136,9 +136,9 @@ describe Spree::TaxRate, type: :model do
   describe "#adjust" do
     let(:taxable_address) { create(:address) }
     let(:order) { create(:order_with_line_items, ship_address: order_address) }
-    let(:tax_zone) { create(:zone, countries: [taxable_address.country], default_tax: default_tax) }
+    let(:tax_zone) { create(:zone, countries: [taxable_address.country]) }
     let(:foreign_address) { create(:address, country_iso_code: "CA") }
-    let!(:foreign_zone) { create(:zone, countries: [foreign_address.country], default_tax: false) }
+    let!(:foreign_zone) { create(:zone, countries: [foreign_address.country]) }
     let(:tax_rate) do
       create(:tax_rate,
         included_in_price: included_in_price,
@@ -152,83 +152,40 @@ describe Spree::TaxRate, type: :model do
 
     describe 'adjustments' do
       before do
-        # Please remove this silencing once we remove `Spree::Zone.default_tax`
-        Spree::Deprecation.silence do
-          tax_rate.adjust(nil, item)
-        end
+        tax_rate.adjust(nil, item)
       end
 
       let(:adjustment_label) { item.adjustments.tax.first.label }
 
       context 'for included rates' do
         let(:included_in_price) { true }
-        let(:default_tax) { true }
-
-        context 'when they are not refunded' do
-          let(:order_address) { taxable_address }
-
-          context 'with show rate in label' do
-            let(:show_rate_in_label) { true }
+        let(:order_address) { taxable_address }
 
-            it 'shows the rate in the label' do
-              expect(adjustment_label).to include("12.500%")
-            end
+        context 'with show rate in label' do
+          let(:show_rate_in_label) { true }
 
-            it 'adds a remark that the rate is included in the price' do
-              expect(adjustment_label).to include("Included in Price")
-            end
+          it 'shows the rate in the label' do
+            expect(adjustment_label).to include("12.500%")
           end
 
-          context 'with show rate in label turned off' do
-            let(:show_rate_in_label) { false }
-
-            it 'does not show the rate in the label' do
-              expect(adjustment_label).not_to include("12.500%")
-            end
-
-            it 'does not have two consecutive spaces' do
-              expect(adjustment_label).not_to include("  ")
-            end
-
-            it 'adds a remark that the rate is included in the price' do
-              expect(adjustment_label).to include("Included in Price")
-            end
+          it 'adds a remark that the rate is included in the price' do
+            expect(adjustment_label).to include("Included in Price")
           end
         end
 
-        context 'when they are refunded' do
-          let(:order_address) { foreign_address }
-
-          context 'with show rate in label' do
-            let(:show_rate_in_label) { true }
-
-            it 'shows the word "refund" in the label' do
-              expect(adjustment_label).to include("Refund")
-            end
-
-            it 'shows the rate in the label' do
-              expect(adjustment_label).to include("12.500%")
-            end
+        context 'with show rate in label turned off' do
+          let(:show_rate_in_label) { false }
 
-            it 'adds a remark that the rate is included in the price' do
-              expect(adjustment_label).to include("Included in Price")
-            end
+          it 'does not show the rate in the label' do
+            expect(adjustment_label).not_to include("12.500%")
           end
 
-          context 'with show rate in label turned off' do
-            let(:show_rate_in_label) { false }
-
-            it 'shows the word "refund" in the label' do
-              expect(adjustment_label).to include("Refund")
-            end
-
-            it 'does not show the rate in the label' do
-              expect(adjustment_label).not_to include("12.500%")
-            end
+          it 'does not have two consecutive spaces' do
+            expect(adjustment_label).not_to include("  ")
+          end
 
-            it 'adds a remark that the rate is included in the price' do
-              expect(adjustment_label).to include("Included in Price")
-            end
+          it 'adds a remark that the rate is included in the price' do
+            expect(adjustment_label).to include("Included in Price")
           end
         end
       end
@@ -236,7 +193,6 @@ describe Spree::TaxRate, type: :model do
       context 'for additional rates' do
         let(:included_in_price) { false }
         let(:order_address) { taxable_address }
-        let(:default_tax) { false }
 
         context 'with show rate in label' do
           let(:show_rate_in_label) { true }

data/spec/models/spree/taxon_spec.rb

@@ -1,8 +1,8 @@
 # coding: UTF-8
 
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Taxon, type: :model do
+RSpec.describe Spree::Taxon, type: :model do
   describe '#to_param' do
     let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") }
 

data/spec/models/spree/taxonomy_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Taxonomy, type: :model do
+RSpec.describe Spree::Taxonomy, type: :model do
   context "#destroy" do
     before do
        @taxonomy = create(:taxonomy)

data/spec/models/spree/transfer_item_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::TransferItem do
+RSpec.describe Spree::TransferItem do
   let(:stock_location) { create(:stock_location, name: "Warehouse") }
   let(:stock_transfer) { create(:stock_transfer_with_items, source_location: stock_location) }
   let(:transfer_item)  { stock_transfer.transfer_items.first }

data/spec/models/spree/unit_cancel_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::UnitCancel do
+RSpec.describe Spree::UnitCancel do
   let(:unit_cancel) { Spree::UnitCancel.create!(inventory_unit: inventory_unit, reason: Spree::UnitCancel::SHORT_SHIP) }
   let(:inventory_unit) { create(:inventory_unit) }
 

data/spec/models/spree/user_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::LegacyUser, type: :model do
+RSpec.describe Spree::LegacyUser, type: :model do
   context "#last_incomplete_order" do
     let!(:user) { create(:user) }
 
@@ -100,7 +100,7 @@ describe Spree::LegacyUser, type: :model do
   end
 end
 
-describe Spree.user_class, type: :model do
+RSpec.describe Spree.user_class, type: :model do
   context "reporting" do
     let(:order_value) { BigDecimal.new("80.94") }
     let(:order_count) { 4 }
@@ -168,7 +168,16 @@ describe Spree.user_class, type: :model do
     end
   end
 
+  # TODO: Remove this after the method has been fully removed
   describe "#total_available_store_credit" do
+    before do
+      allow_any_instance_of(Spree::LegacyUser).to receive(:total_available_store_credit).and_wrap_original do |method, *args|
+        Spree::Deprecation.silence do
+          method.call(*args)
+        end
+      end
+    end
+
     context "user does not have any associated store credits" do
       subject { create(:user) }
 

data/spec/models/spree/validations/db_maximum_length_validator_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Validations::DbMaximumLengthValidator, type: :model do
+RSpec.describe Spree::Validations::DbMaximumLengthValidator, type: :model do
   with_model 'LimitedProduct', scope: :all do
     table do |t|
       t.string :slug, limit: 255

data/spec/models/spree/variant/price_selector_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Variant::PriceSelector do
+RSpec.describe Spree::Variant::PriceSelector do
   let(:variant) { build_stubbed(:variant) }
 
   subject { described_class.new(variant) }

data/spec/models/spree/variant/pricing_options_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Spree::Variant::PricingOptions do
+RSpec.describe Spree::Variant::PricingOptions do
   subject { described_class.new }
 
   context '.default_price_attributes' do

data/spec/models/spree/variant/scopes_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "Variant scopes", type: :model do
+RSpec.describe "Variant scopes", type: :model do
   let!(:product) { create(:product) }
   let!(:variant_1) { create(:variant, product: product) }
   let!(:variant_2) { create(:variant, product: product) }

data/spec/models/spree/variant/vat_price_generator_spec.rb

@@ -1,6 +1,6 @@
-require "spec_helper"
+require "rails_helper"
 
-describe Spree::Variant::VatPriceGenerator do
+RSpec.describe Spree::Variant::VatPriceGenerator do
   let(:tax_category) { create(:tax_category) }
   let(:product) { variant.product }
   let(:variant) { create(:variant, price: 10, tax_category: tax_category) }